Merge cherrypicks of ['googleplex-android-review.googlesource.com/31389457', 'googleplex-android-review.googlesource.com/31391237'] into 25Q1-release.

Change-Id: I0036d1e0fb908888b8dd7db42e074b58893b5d82