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

Change-Id: Ic38f9bcc28b86f28b5ca2cc0b0322ee09e08e233