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

Change-Id: I8040a36f216692cc96433cd4fa1f48043333df2c