Merge "Fix bug in maximum number of allocs." am: 8b04903ba1 am: b9244a803a

Change-Id: Ia9cbfc83b06b1ef9e7a69dc9acd0dab1adc4f19b