[coastguard skipped] Merge sparse cherrypicks from sparse-11916799-L31400030004162595 into 24Q3-release.
COASTGUARD_SKIP: I849e1d3a06659f1c19638a4ddbedfaeacf3b5066 Change-Id: I66b8ba1b36a7947e0d758fa2e0bdbf79451c383d
This commit is contained in:
commit
5b5dfdb1f4