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

Change-Id: Ic30e594e350d67d6b966b55f23908ba83d75c15f