Merge "Fix nav accessibility order" into oc-dr1-dev
am: 39bf473dfb

Change-Id: Ib866d4e9f60c087de21d6499ec8dcfd9ebeff220