am 5a923344: Merge "Change the 64 bit map address format." into mnc-dev

* commit '5a9233444b519cb866cc657a4dce27c45f089a97':
  Change the 64 bit map address format.