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

Change-Id: If2daf92e3b7aed37832aa0787a2c689d8bdedd97