Merge "Revert "Add test for changing annotations.""
am: 3e0a4100f6

Change-Id: I70b1045d3dd09cf2e35c13617b00755031c1caab