Merge "Remove references to property size limits."
am: 8f8daca7ab

Change-Id: I146d719f51f6337abe13fc96b7e99fd7c4aebdcf