Merge "Add Launcher shortcuts." into nyc-andromeda-dev
am: 30116428a9

Change-Id: I8f7f532bd880dd2c38ca861014932a02ba874f4f