am 2da6e4ae: Merge "Avoid memory leaks when handling metadata strings"

* commit '2da6e4ae488896df10b22166b0aa0b2cc15492f1':
  Avoid memory leaks when handling metadata strings