Merge "Refeactor region clearing / allocation code"
am: e5232948fb

Change-Id: I1682484077fe90f804e8b5902a9af8b09d967d08