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

Change-Id: I73d97e703880ea02da8045fa95aa8b1f92a84987