am 4d59fcfb: Merge "Suppress clang warning until upstream fix."

* commit '4d59fcfbd820e0a43367fb91c49cccaff4655ba6':
  Suppress clang warning until upstream fix.