am 439b3d9f: Merge "Remove usages of the jsr-330 annotations"

* commit '439b3d9f73855c637389e948926d907a1abfa669':
  Remove usages of the jsr-330 annotations