Diaz signed a minor-league contract with the Giants on Tuesday.
Diaz agreed Friday to a minor-league contract with the Dodgers that includes an invitation to spring training, Eric Stephen of SBNation.com reports.
Diaz opted for free agency Thursday, per the Triple-A Norfolk transaction log.
Diaz cleared waivers and was outrighted to Triple-A Norfolk on Thursday, Roch Kubatko of MASNSports.com reports.
Diaz was returned to Triple-A Norfolk following Sunday's win over the Red Sox, Zachary Silver of MLB.com reports.
The Orioles added Diaz from Triple-A Norfolk as their 27th man for Sunday's Little League Classic matchup with the Red Sox in Williamsport, Pa.
Diaz was optioned to Triple-A Norfolk on Wednesday.
Diaz was recalled from Triple-A Norfolk on Monday.