Merge "Fix clang -Wc++11-narrowing warnings."