Merge \\"Update ShortcutManager javadoc\\" into nyc-mr1-dev am: 3858c4704c
am: fc981defac

Change-Id: I753642044fa8cf17f9134002dc9cb375b9c22b31