Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am: 61dad4b2fc am: 897df2b5af
am: 602c3c7073

Change-Id: I496cfe09a488f9bfc278e10e72423da3e2406c6f