Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am: 61dad4b2 am: 897df2b5 Change-Id: I32b241e93caac5e38c54610b799c877365be75ff