am dccbb07d: am a66532e7: am 91baad56: Merge "Fix some clang compilation issues."

* commit 'dccbb07dfbdd23016eff1de5b9c14ac3c5999cfd':
  Fix some clang compilation issues.