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

* commit '42472665e5bbd104925cf5e2fcd3cef044744462':
  Change the 64 bit map address format.