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

* commit '767e1c010c0664fa4bf7e7e32b840af4bbe0b0cf':
  fix potential memory leak