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

* commit '493cdcbb77f2cea10122611104c6ecfbe1d158ce':
  Change the 64 bit map address format.