Merge "Do not deliver INSTALL_SHORTCUT." into oc-dev am: ecabc596b7
am: be6c028ba7

Change-Id: I69b70d672f5a3f12d902303ff58faf02dd8cf6ef