Merge cherrypicks of ['googleplex-android-review.googlesource.com/27587856', 'googleplex-android-review.googlesource.com/26816500', 'googleplex-android-review.googlesource.com/28295752'] into 24Q3-release.

Change-Id: I4c09fd94d8b6eb4050276f4484ae96128d8149f0