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

Change-Id: Ibe0976c975e292acac100c37d4c9325dc1878ae6