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

Change-Id: I99883300e0b2cac5d6cef611d3f1be96c66e5616