Merge "Fix clang static anaylzer warnings."