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

Change-Id: I8f035726b5ff771291eceb4ca2b4178c7a61ac9c