Merge \"Fix accessibility for autorotate tile.\" into nyc-dev
am: 7f9e4d13c0

Change-Id: Ic0ff4b1219ca5c1723bce74cba7736521fd447aa