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

Change-Id: I56e0a7f8ffacc6af45bfd5326527671b6e6aee80