Merge cherrypicks of ['googleplex-android-review.googlesource.com/26949279'] into 24Q2-release.

Change-Id: Ic26de9c66818955363e762d6ddd15ae35cdb7b9a