Merge "Remove deprecation annotation" into main