am 227a451f: am 3c50e230: Merge "Use ATTRIBUTE_UNUSED more."

* commit '227a451f07bb2707c64bab95c9642a769706247c':
  Use ATTRIBUTE_UNUSED more.