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

* commit 'fb14e77f45fbad139a0b0c9278bd003964b8f987':
  Fix memory leak