Merge "API: Fix missing @NonNull annotations"