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

Change-Id: I8f87f2dc652aa5c36d8753f2df31185c637e30c7