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

* commit 'bb2f65e64844bfca8d05d4c37991d858aa748648':
  Fix build by putting ATTRIBUTE_UNUSUED.