Merge "init: remove non-protobuf single persistent property file"