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

Change-Id: I58d332e88153f7d3e2cb3235b9e2f1dee209aff6