Merge "Revert "Refeactor region clearing / allocation code""
am: ac2f74c045

Change-Id: Ib08d39e2ed62634a091132c7a1a1d37d3a8e3b78