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

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