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

Change-Id: Ibddf32a6fbf37988755d08eef31135749af29089