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

Change-Id: Ic48a2f015514ef3782f650afdad5d66f7ec9389f