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

Change-Id: I93903c15fdbd8fa36ffd708807e6f7b3f0b76da1