am c47b7d37: am 9d4ebdca: am cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."

* commit 'c47b7d377c4785f84a22c42c6a99716cceb5973c':
  XmlUtils#readThisMapXml should handle null keys.