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

Change-Id: I2abfb0d54e13b25ee7457f6d954e3032553641ce