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