Merge "init: allow ':' in property names"
am: af95ecdb04

Change-Id: I0f7343072b365cc8cb46f231596f12ec945cee79