Merge \\"Fixing several issues with accessibility\\" into nyc-dev am: 987cd20acf
am: 55e93a0594

Change-Id: I8de1b1bf792f72c86c74c6e1b10771d5dccb836f