Merge "There's no longer a limit on property names."
am: dda91dbef8

Change-Id: Ia3e5851c5033b35d28ad1405b863c8305ccd8cf8