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

Change-Id: Ie9730fe2834012de7387e9452783fb52a2f7714b