Merge "Fix NPEs in ShareTargetPredictorTest.setUp()" into main