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

* commit 'f49d7ce9d3686324cb67845736d1d643ffdf464c':
  Fix accessibility order in nav bar

Change-Id: Id93f413e2e1eea43e4362876346f86c44a3b009e