am 84fcaea5: am 8b32c30b: Merge "Add offset to map data."

* commit '84fcaea57c84cf6200a01af425582fdb101dba45':
  Add offset to map data.