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

Change-Id: Ic98b0d97858900bd4d74001769144483ff092f34