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

* commit 'cb84ec875e1d15575726adfb4592d27522eea070':
  ShortcutManager sample update:

Change-Id: I55ebc36f70e1021988f9cb8cee83bd501cefe8f8