Merge "init: remove non-protobuf single persistent property file" am: 61578ab50b am: aceda86059 am: 27c56990ce
am: 73a01e2ea4

Change-Id: Ib81c83365caf98856f9f6349e6ca6efc5c2717a9