Merge "API: Add missing nullability annotations"