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

Change-Id: Ie413aa25233db86ad236ece01f961103d133cb60