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

* commit '3857c06ebc490658e3820c13070124f0148e8d34':
  Fix accessibility order in nav bar

Change-Id: Ib70205bf79e9bef27807bc58a725e6015977bc75