Merge "Avoid redundant getAllocatableBytes() calls." into pi-dev am: b2e6d9eee0
am: 6ed4d85637

Change-Id: Iaf38e77a462aa8b8780fe1bdc66d31f2259f13de