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

Change-Id: I629077a3326669ccb889f342e3d1dd8f24192ec9