Merge cherrypicks of ['googleplex-android-review.googlesource.com/26501529', 'googleplex-android-review.googlesource.com/26482538', 'googleplex-android-review.googlesource.com/26483145', 'googleplex-android-review.googlesource.com/26639696'] into 24Q2-release.

Change-Id: I485cfa9dedf8fca93e836e4650d384a752f5a9c2