Merge "Overflow a11y" into rvc-dev am: 8333811d76

Change-Id: I2e8fee4363de6142299ef481fc84f4f71fcf03c5