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

Change-Id: I987c25d322b7cdcc807df1623fbd4cf33916f037