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

Change-Id: I17cc26564ca587918403b99cb81c1ef2f6a78091