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

Change-Id: I086260100d57c3a88e85e3af6eb6b617f2374322