Merge "Remove annotations that have been relocated" into sc-dev