Merge "Add missing @NonNull"