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

Change-Id: I25eef058fb8094834a7f9cdbf74679216b08277a