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

Change-Id: I10b43a27c25cb917736a99877212ec180577d332