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

Change-Id: I88c6291be43822083a1c079520322a0d177ea1ad