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

Change-Id: Ia227cf2646cb0e5b01a2e39bb6fbe837715e0984