Merge "Avoid adding region space bitmap to heap bitmap" am: 7616adcf93 am: 2cb8b0676a
am: ffaad81b3c

Change-Id: If2dcff4b0303d36cc5215d048887a177e85596e1