[coastguard skipped] Merge sparse cherrypicks from sparse-11949999-L49800030004468874 into 24Q3-release.
COASTGUARD_SKIP: I0aeedc9bcdf8e19e73b0de59ed145ea1f776d4e8 Change-Id: Ie15db30e3303845ce4f3a0c3b1f2b25ba9568f6e
This commit is contained in:
commit
f8a9548eb3