am 396f131d: Merge "Fix memory leak"

* commit '396f131de7646faacd74ec3be11c4861bb233872':
  Fix memory leak