am 33adb2f7: am bb2f65e6: Merge "Fix build by putting ATTRIBUTE_UNUSUED."

* commit '33adb2f7931ddfcce05fb001646a6b91307354fb':
  Fix build by putting ATTRIBUTE_UNUSUED.