Merge \\\"Fixing several issues with accessibility\\\" into nyc-dev am: 987cd20acf am: 18bb19206a
am: 2c42bd73e5

Change-Id: Ia7d694c089a3ca7bb64859af00678b319ff3f29d