Merge "Revert "Revert "Refeactor region clearing / allocation code"""
am: 975bf2ce68

Change-Id: Id54ec276f0641ccc9f474cf4201205654a64e2a6