Merge cherrypicks of ['googleplex-android-review.googlesource.com/39400240'] into 26Q2-release. Change-Id: Ieb21fba8beb151a12c1625d2e490bf3866a80c77