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

Change-Id: Ia0dda0b119baad0e1bfa31ddd060cf6099591921