Merge cherrypicks of ['googleplex-android-review.googlesource.com/26748246', 'googleplex-android-review.googlesource.com/26821905', 'googleplex-android-review.googlesource.com/26749309', 'googleplex-android-review.googlesource.com/26818938'] into 24Q2-release.

Change-Id: I98e8f97370b9ae6334e0391884d211334298faf7