Merge "Remove usages of the jsr-330 annotations"