Merge "Improve the region space memory mapping."
am: 64be7c5531

Change-Id: I55decbdaa71322f78ea9e9bca60e697295aabe64