Merge "Fix clang compiler warnings."