Merge "Make inter-region ref bitmap pointers unique_ptr" am: d429ee9a3a
am: d74fc01c73

Change-Id: I5902469f52610128756ad15e3a69d3ba65f18502