Merge "Remove old source for AnnotationsTest"