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

Change-Id: Icc9917c4ea65c8425b85dcf771fc65225c9c39e5