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