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

Change-Id: I33f8f9a3c29d8dd3c74564c2df1963bc72756070