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

* commit '33b46402596089d94ee128b6e9e7df006847979f':
  Fix memory leak due to smart pointer misuse.