[3.0] Expand the usage of @NonNull