Merge "Shortcut launcher demo:" into nyc-mr1-dev
am: 6d48ba4dd4

Change-Id: Id821fb2ba6bfbc731073e28203f7431762c66df8