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