Merge cherrypicks of ['googleplex-android-review.googlesource.com/26627074'] into 24Q2-release. Change-Id: I8b31bd875b4250e047eb292a24a53e42d7679dc3