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

Change-Id: I133647a253f62208c7ee6deb6cf15a955f09ec8e