Merge "Add missing @NonNull annotations on overridden method"