Merge "Fix clang static analyzer on potential memory leak."