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

Change-Id: I30838bedd35b6100b9927b8be1d7e24daa0fd063