Merge "Add required casts for clang/llvm -Wc++11-narrowing"