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