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

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