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

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