am 0aa212e3: am a74d1332: am 81cfb63e: am d13b23a4: Merge "Revert "fix potential memory leak""

* commit '0aa212e32ad0ef1333941e2c5228c7528da3c40f':
  Revert "fix potential memory leak"