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

Change-Id: I76e21581707cef835d34b8002082a330b388d79d