Merge "Fix false positive memory leak warning."
am: 9147c5ff90

* commit '9147c5ff900f17df6995d171ee336e21e254383a':
  Fix false positive memory leak warning.