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

Change-Id: I1918b70ad644f7aded33d27bcc55e05478d9f773