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

Change-Id: Iddd98eec069c710ca4e86cf4ef98817d81edda0e