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

Change-Id: I9b3a434e5d86a2647240fac8cd3c2683aa669517