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

Change-Id: I2f057e4d0367fd47050c30340490987ef6d2128a