Updated scope to int mapping Change-Id: Ib58a48b8df5fb484c55cafbd3d99eafab6353dc1 Reviewed-on: https://weave-review.googlesource.com/1869 Reviewed-by: Vitaly Buka <vitalybuka@google.com> Reviewed-by: Alex Vakulenko <avakulenko@google.com>