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

Change-Id: I2e4739134c2e548c8ce48c790aa9cc596dccbaab