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