Merge "Create /data/per_boot" am: 21b00b31d4 am: b07606a502
am: 5d3d6f88a0

Change-Id: I9976eec1a5e63ae151dc28170cc638f644dd9883