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

Change-Id: I84bad5fd7fd0bc1de51fa3a7c2d0d1185d6c9fb6