Move preloading to boot complete. am: 16ef39a7f6
am: 52cfea9c35

Change-Id: I08d6ca1d1d26c4792e9973424cb05cf69fcf2871