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

Change-Id: I4a289583d819db7c0131b2a3e993432d11d2142d