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

* commit 'a74d1332cc9f63dc3187cfa74befb448dab5e77d':
  Revert "fix potential memory leak"