Merge "Fix clang static analyzer warnings"