Merge "ShortcutManager sample update:" into nyc-dev am: cb84ec875e
am: 04ba26b4e6

* commit '04ba26b4e614a92059cf328e5b37b0e226b88438':
  ShortcutManager sample update:

Change-Id: I813f1a7296161f4628a455ddd2877f1b93c9da3f