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

* commit 'cb84ec875e1d15575726adfb4592d27522eea070':
  ShortcutManager sample update:

Change-Id: I00fed278e7048e6036c30e981d5f7298d17fdced