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

Change-Id: I11d8c63b37f03211358703cc1944c04b2686af1d