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

Change-Id: I887087b781dd9d83e6b597eb491e35f046b91aa8