Merge "init: use protobuf for serialization of persistent properties" am: f5dba11085 am: 61b81a0341 am: 74c45a41cc
am: 8b4315330e

Change-Id: I0f7345f60e8aea9307510ce59a98b0e07cea76fb