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

* commit 'a7e455a711d5d6156d51b7243bcd8891629229b3':

Change-Id: I7cc9acc0e440fdbd485895fe75a7b01ea3fb0fa1