Merge "Update address space of map if it changes. am: b5ab7580 am: 292f21f0" into nyc-mr1-dev-plus-aosp