Merge "Add @Nullable to methods that can and do return null.  No behavior change." into main