Merge "Fix false positive memory leak warning."