am 9aac0c1b: Merge "fix potential memory leak"

* commit '9aac0c1b35ec666a18f320be99e6aa37d0bcf202':
  fix potential memory leak