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

Change-Id: I3948bfe8bbaab047772b2e823f898dec2393052b