Merge "Actually add right instant app boilerplate."
am: ea43984478

Change-Id: I0d1453f0b783d3b0108133f73faa994d3e048285