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

Change-Id: I59726a1cbe466d37818257104c867f2b541f4b12