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

Change-Id: I6f2856dfc2b11f7bc4c03059ce3626528b8d4538