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

Change-Id: I668c7298cdcb8b57f1397c3ef5469ad6f141ea66