Merge cherrypicks of ['googleplex-android-review.googlesource.com/26497774', 'googleplex-android-review.googlesource.com/26544858', 'googleplex-android-review.googlesource.com/26553571'] into 24Q2-release.

Change-Id: I9688377ae9f2d17236449736df91b7302b8f6a0b