Avoid duplicate tests.

Change-Id: I029df98d8dc6914a0f1c052fad4d728e6e39c956
Merge topic '15025_fix_annotations' into next

ed728633 Avoid duplicate tests.