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

Change-Id: Ib762cc51c0e56b9440545b48fe2d11208abfd890