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

Change-Id: Ica58ba3622740181381b598401c8786e87b84895