Merge cherrypicks of ['googleplex-android-review.googlesource.com/28239904'] into 24Q3-release. Change-Id: I3381dec599237b17305cd7cb3e39571625d1b270