Merge "Remove __nonnull (in favor of _Nonnull)."