Merge "Add "instant app" boilerplate" am: 82dfcb76fe am: 4183e1cc8a
am: 8eabe8f1ce

Change-Id: I8c1296f0f994c3677bcd0bbfc2b1eadce3665eed