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

Change-Id: I3566cbf6732b277efce1581cf4084249941221a2