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

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