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

* commit '8b32c30b92be6914da2dca23089473c4f37adfb9':
  Add offset to map data.