Merge cherrypicks of ['googleplex-android-review.googlesource.com/26728167', 'googleplex-android-review.googlesource.com/26882441'] into 24Q2-release.

Change-Id: Ib1e4e427c21be023f67c652669e2bcf6589f7c72