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

Change-Id: Id3706892e6d34ca97ac2824099d7830b2340e78c