Merge "Add A11y Slices" into pi-dev
am: bc4c392ff4

Change-Id: I255331e6b490f29011818feca9ff97e2d37dff1b