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

Change-Id: I16ea8b527e89a1227089d54764af934fcef6d286