Merge "Add test for changing annotations."
am: 9c0cc42512

Change-Id: Ieb97941ebe1f453a0b83e39f0f85d51fbb3c6fb1