Merge "Revert "Revert "Add test for changing annotations."""
am: c7e1904010

Change-Id: I567cc65fc54369c3e87b93755d6ba7f6ace43980