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

Change-Id: Ie6b961b44cda35b536aae8a1297da8f053526eed