Merge cherrypicks of ['googleplex-android-review.googlesource.com/26593353', 'googleplex-android-review.googlesource.com/26629048', 'googleplex-android-review.googlesource.com/26635458'] into 24Q2-release.

Change-Id: Id1d0f081d62ba81b74cfd53e5c04259b7d3a4422