am 9dc5d30b: Merge "Fix build. New clang has stricter checking."

* commit '9dc5d30b852a60ab748819adc6bf6586a5a14423':
  Fix build. New clang has stricter checking.