Merge "Improve a11y ordering" into pi-dev
am: 3789bbc476

Change-Id: I873a9458755686d2e86d73fa001806c5e7bf0197