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

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