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

Change-Id: Iaacc63e7a24129abec9b177624c86cd722aba8c8