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

Change-Id: Ifd959812b7860f64ebedc900efbcf65db202295f