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

Change-Id: I8855ddf28f6e58a5ef41a0272d52a9d434f0ef25