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

Change-Id: Id35732bcee8281eeee000cfa1166d50636897d94