am 4d383c60: Merge "Fix clang -Wc++11-narrowing warnings."

* commit '4d383c60d9423729b12bbdbc684b5df35c20c1f6':
  Fix clang -Wc++11-narrowing warnings.