Merge "init: allow ':' in property names" into oc-dev
am: 8ecf59439c

Change-Id: If0c5a334fe7f0b5618ed9f74b96f65f013435b9b