Update address space of map if it changes. am: b5ab758
am: 292f21f

* commit '292f21f07f817e0b228930088f653226f67c7131':
  Update address space of map if it changes.

Change-Id: I282bd94a4e700e65732ae8ff5cd6d9882ea66ce7