Updated @NonNull + @Nullable annotations.