Merge "Actually add right instant app boilerplate."