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

Change-Id: I957eae53887910a44f010130f6dc6c35271253b2