Merge cherrypicks of ['googleplex-android-review.googlesource.com/26620869', 'googleplex-android-review.googlesource.com/26620870', 'googleplex-android-review.googlesource.com/26588797', 'googleplex-android-review.googlesource.com/26600850'] into 24Q2-release.

Change-Id: I6d3cdded973e291953847f48db53072dc4792bc1