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

* commit '81cfb63e9fc6ef72e5b488225fe9b7a43551fc9e':
  Revert "fix potential memory leak"