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

Change-Id: I0ffd46ea6c2ce53e509777cbbff7109a4ea0c0e5