[coastguard skipped] Merge sparse cherrypicks from sparse-11630522-L01700030002727860 into 24D1-release.

COASTGUARD_SKIP: I253630ea16ec7c4e40447b2ef3151c32da617a32
COASTGUARD_SKIP: I701231900a7872512ca851bc1a0a6f68528b4ed3

Change-Id: I8b2be46f261b306f4abb73a7fe2ecf0eebf1a8e4