Merge "init: do not load persistent properties from temporary /data" am: b1d93a8136 am: b916f49bd7 am: ec9aa8ce7c
am: c6b2317d59

Change-Id: Ic60e00a0db21480978152daadd43ca1204063df4