Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am: 61dad4b2fc
am: 897df2b5af
Change-Id: I32b241e93caac5e38c54610b799c877365be75ff
This commit is contained in: