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

Change-Id: I4916c1f1287581e247f81d9ecc4e3a3ead970f60