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