Move preloading to boot complete. am: 16ef39a7f6
am: 067d73e55b

Change-Id: I03c9bbb8795b6ae43681dfc1787420a1cb997fdd