Merge "Always add the instant app installer" into oc-dev am: e943a3cbe7
am: 9abb2cb590

Change-Id: I1be04d7ec849205df78d2a50e33652f59d61ee5a