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