[coastguard skipped] Merge sparse cherrypicks from sparse-11559474-L79500030002452450 into 24D1-release.

COASTGUARD_SKIP: I0fe0bb22e293093d941b4d8ba826c8c8689a370d
COASTGUARD_SKIP: I32dab4fd7d45c3982c2f8ea10b2ab4aaeb4a56b8

Change-Id: Id14b7d1ae6855bd131da6173d4cbf40f3c0c8c7d