Argument with 'nonnull' attribute passed null

(cherry picked from commit fbf682c865c55dc30e3439c977b8c16cb54702ba)
Regenerated build/