Merge cherrypicks of ['googleplex-android-review.googlesource.com/33833389'] into 24Q3-platform-release.

Change-Id: Ida93f5ba58c85e3616cb3f78a9c7fe31474130da