am 947b9b39: am 09d8a6e3: Merge "slang: Improve handling of StringMapEntries."

* commit '947b9b39f26e4c7e152ae450f7ff45966b57e499':
  slang: Improve handling of StringMapEntries.