Merge \"Set secure setting when all preloaded apps are installed\" into nyc-mr1-dev
am: 65e3c7420d

Change-Id: I1fdb434167f5031253bbb7a8f910c4b33c12e617