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

Change-Id: I221d6f1015cb3fab6e6d937f952963568b475e0a