Merge "Fix accessibility order in nav bar" into nyc-dev
am: 4691e24d0b

* commit '4691e24d0b0f0cd0c9728d9e937513ebbe98a1f3':
  Fix accessibility order in nav bar

Change-Id: Id81fcdc1344e3583f53a21c10c3d9681bae34367