am 3c50e230: Merge "Use ATTRIBUTE_UNUSED more."

* commit '3c50e2302c98cfb5c49969ba1b82af2e8bba08fa':
  Use ATTRIBUTE_UNUSED more.