Merge "Fix small typo in ShortcutManager header docs" into nyc-mr1-dev am: aea27e1aea
am: 8f8547f1ed

Change-Id: Ifa3dc3e3318f2b3f12ca3ad80f9a0c9787c82145