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