Merge "init: allow ':' in property names" am: af95ecdb04 am: 6d2a27768d am: 3d2aa93e1d
am: 6eac551c34

Change-Id: I5b12c6e69f2ac1e124b48eaca32a6800a37f64d6