Merge "Create /data/preloads on post-fs-data" am: ac305c82d6
am: 37d07accca

Change-Id: I2b779529e1916370fb808730765ce04087a24a1f