[coastguard skipped] Merge sparse cherrypicks from sparse-12210230-L10500030006138850 into 24Q3-release.

COASTGUARD_SKIP: Ibec4f0c908089ca4304e59e9d37529fa2d4fa40d
COASTGUARD_SKIP: I665d9ff203ef7b17a8da20ef73abe0b54fd5356b

Change-Id: Iefbefaceb66103f74a5eb526cf5607719fa9c837