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

COASTGUARD_SKIP: I2937d91954470f2b28e4e719ae82139bd622084f
COASTGUARD_SKIP: I32258500ec02c2a8cbfc6d0b37aaea2c83c7c8b4

Change-Id: Ic8dff64f700bfde4e80ad473e95ca513e27aaf59