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

Change-Id: I0891587f8565ce6cec93264e153e0b5525146fc2