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

Change-Id: If929eb6332d705c52753afeb955a052376ec8ed1