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

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