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

Change-Id: Ia43b65daf50af36326610715f98f58474d1b5944