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

* commit 'ce1928e987923a276ff048c69d9a6f43f22610ba':
  Add required casts for clang/llvm -Wc++11-narrowing