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

Change-Id: I4c337b36f6b5fee25a6bd03d71caac46519c8154