SCHEMA-545. Fix for removed javax.annotation.Nonnull.

Reviewed over-the-shoulder by Aaron Feldstein.