Merge \"Move preloading to boot complete. am: 16ef39a7f6 am: 52cfea9c35\" into nyc-mr1-dev-plus-aosp
am: 57b4545f98

Change-Id: I82046b22f1b792d0c04515fc2b2bf315c6b87f9d