Merge \\"Install preloaded apps into the demo user\\" into nyc-mr1-dev am: c77a2be407
am: 9b9f2013f4

Change-Id: I0292062b3f4f581f992101ca2c9112af6cad7c2b