Merge "Remove deprecated annotation." into main