Merge "Remove the name length limit for system properties." am: c657b769ab am: 6f00e6e977
am: b088dd5d15  -s ours

Change-Id: I4c40815a0bbb4bf216fb9ac98c9c37853a74c5a0