Merge "Fix RTL for blocked number layout" into nyc-dev
am: 11541f7

* commit '11541f72256f2d7e7f740013b8dd4b2d1d049e96':
  Fix RTL for blocked number layout

Change-Id: I26068be538e5af6b69067010f4dee0d2c3570c93