Merge "Introduce the CovariantReturnType annotation"
am: f84d25b173

Change-Id: Ib1cf2053934cf39f6ecaef3ca0176ed7a201eb0d