am 4f27968f: am 494bd36d: am dda63545: Merge "Improving maps output."

* commit '4f27968f988808c713564de99c04612b9e8768b9':
  Improving maps output.