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

Change-Id: I0c234b9e3f2778951c729ed6daed96bcc3b394d2