Merge "Remove references to property size limits." am: 8f8daca7ab am: 75500cc6fd am: 624f84956b
am: 22cc9245f1

Change-Id: Icabe7e4b4726e3b204bb08829dd0434c8d00e8f3