Merge \"ShortcutManager javadoc\" into nyc-mr1-dev
am: 3746d2224d

Change-Id: I1a856a61c3453acd02a2541533a268ade9dd5933