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

* commit 'eec37a0f6c80fe9e790622078bd8670085d40deb':
  ShortcutManager sample update:

Change-Id: Id91f7ef2ccf4f76be4a48b3ca0e858b1e63e6924