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

Change-Id: I680addf05c91cc468ab7fef0503ba6712828d918