Merge "Allow ':' in property names." am: 04a2c850db am: 613a9738e3
am: c042a40488

Change-Id: If71691b4bba1f286819949d615070daa3f7f3c0f