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

Change-Id: I1b9e684f6f45e70312ea894cf23a5c210879195e