Merge "Ignore tags in comments that are actually Java annotations"