Merge "Persistent bitmap for region space"
am: 08172e05dd

Change-Id: Idfbff6d6b3ea6d152afb5edb9598b6b99232a992