Merge cherrypicks of ['googleplex-android-review.googlesource.com/27918880', 'googleplex-android-review.googlesource.com/28027477', 'googleplex-android-review.googlesource.com/28326671'] into 24Q3-release.

Change-Id: Id237df0d96a112e47b00d5f9ba0884e99f935c86