Merge remote-tracking branch 'upstream/next' into address_allocation
Merge remote-tracking branch 'origin/address_allocation' into address_allocation
Updated address_space_tool.