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

Change-Id: Idb75e757f75f4f390a4ef596f37bbcc7c854e73e