Fix initialization of new installations

Change I2615666bc1c929c0c045840fad1ece55fb0640af's upgrade scenario
only applied to installations coming specifically from version 5.
Devices with older versions or installing afresh would get invalid
initial data. Fixit

Change-Id: I170d9ef284c250767467695015bf4e57bc1454c2
Merge branch 'cm' into HEAD