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

Change-Id: Ifac613535ad66ebdeab76fa76298375b8b6fd658