am 58fce89c: am a1ce3043: Merge "Fix memory leak due to smart pointer misuse."

* commit '58fce89cfe266808ce7f9e6988877b7822d8817a':
  Fix memory leak due to smart pointer misuse.