Merge cherrypicks of ['googleplex-android-review.googlesource.com/26816500', 'googleplex-android-review.googlesource.com/28295752'] into 24Q2-release. Change-Id: If2b51f86a38420ce7a49ca3a9e2a3f7f5962a76e