Merge "init: use protobuf for serialization of persistent properties" am: f5dba11085
am: 61b81a0341

Change-Id: I65fa2e2d610b68ef4b3adc751cfaa58856323762