Merge cherrypicks of ['googleplex-android-review.googlesource.com/27586231', 'googleplex-android-review.googlesource.com/26824328', 'googleplex-android-review.googlesource.com/28319518'] into 24Q3-release.

Change-Id: I82cb048cb14119b6b3c47a2e1aed3b4cf97e213a