Merge cherrypicks of ['googleplex-android-review.googlesource.com/26245621', 'googleplex-android-review.googlesource.com/26247218', 'googleplex-android-review.googlesource.com/26247756', 'googleplex-android-review.googlesource.com/26463011', 'googleplex-android-review.googlesource.com/26666719'] into 24Q2-release.

Change-Id: If33004cbe8ac0811f6809339785a04c3dbec612b