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

* commit '3857c06ebc490658e3820c13070124f0148e8d34':

Change-Id: I85e7440a8e5ed906f0f2b54a9cf1669f3528c926