Merge "Update address space of map if it changes. am: b5ab7580 am: 292f21f0"...
Merge "Update address space of map if it changes. am: b5ab7580 am: 292f21f0" into nyc-mr1-dev-plus-aosp
am: a7e455a7
* commit 'a7e455a7':
Change-Id: I7cc9acc0e440fdbd485895fe75a7b01ea3fb0fa1