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

Change-Id: I68ea7ea293f4591b704cd49846bae58569567aba