Merge \\"Keyboard shortcuts: A11Y fixes cherry pick\\" into nyc-mr1-dev am: 448160e1e9
am: 0fcea07ec8

Change-Id: I070cfb98582d989dec1c2b1e24bce7bd013cbd10