Merge "Update test to handle annotation migration"