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

* commit '0ccaed41a37a68e934177fd5b40d06f9af03e66c':
  ShortcutManager sample update:

Change-Id: Ia1d522dd6340c5df707e7011aab08d3b019dfc4d