Merge cherrypicks of ['googleplex-android-review.googlesource.com/31192861', 'googleplex-android-review.googlesource.com/31192862', 'googleplex-android-review.googlesource.com/31192863'] into 25Q1-release.

Change-Id: Ie7faa8becf7d795d404375681557c18e5c746525