[coastguard skipped] Merge sparse cherrypicks from sparse-11704978-L55100030003094529 into 24Q3-release.

COASTGUARD_SKIP: I3cd81b65f943d4ab6c5d981dbe6e9d5bf336e612
COASTGUARD_SKIP: I12bca400bbed2f0cb05a4d0645c4d2172b1259d2

Change-Id: I12bb951fb88f82c434333c70019b1222c709e0a2