Merge "There's no longer a limit to property names." am: b6cb9b0457
am: 734aacf679

Change-Id: Ia936f33eda1ba49f53ff0763938769c1dae1bc16