Merge "Introduce the CovariantReturnType annotation"