Merge cherrypicks of ['googleplex-android-review.googlesource.com/27140479',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27140479', 'googleplex-android-review.googlesource.com/27053555', 'googleplex-android-review.googlesource.com/27250425', 'googleplex-android-review.googlesource.com/27094197', 'googleplex-android-review.googlesource.com/27431144', 'googleplex-android-review.googlesource.com/27263999', 'googleplex-android-review.googlesource.com/27801400'] into 24Q2-release.

Change-Id: Ibeca3b997ee82d1d30cd8872a3ff99b405c8a93d