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

Change-Id: Ie8c833054f2a4e11698f237caab65a4af17ea94f