am f18eb323: am 767e1c01: am 9aac0c1b: Merge "fix potential memory leak"

* commit 'f18eb323c38cd4407b16dc8eda1cc860bb100850':
  fix potential memory leak