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

Change-Id: I8e9b0f46a2d7ca97cd0e4189815d48e4551ad8a0