am 697541b4: am 493cdcbb: Merge "Change the 64 bit map address format."

* commit '697541b4e88a7c4afa9db5abdeb3533e53333e7e':
  Change the 64 bit map address format.