am 6da3cc59: am 396f131d: Merge "Fix memory leak"

* commit '6da3cc59a0e77e723a8413d2443b0f1bc5821b03':
  Fix memory leak