Update patch per sandbox team, link to upstream tickets.

Package-Manager: portage-2.1.12.2