Merge cherrypicks of ['googleplex-android-review.googlesource.com/28598173', 'googleplex-android-review.googlesource.com/28598174'] into 24Q3-release.

Change-Id: Ia25ea9c081441409f32d49a0367b8765db59fe22