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

Change-Id: I5f632d147c7b83cf5f375da572e269ce13626ce4