Merge "Remove ShortcutManager samples from nyc-dev" into nyc-dev am: 29e02b117d  -s ours am: 5b93a5e616
am: f7028db4a1

* commit 'f7028db4a198b9e1e0069c23a1c78034911ad71d':

Change-Id: Id0ff87c57b94ae396a46e89af1511e02e128c395