Merge cherrypicks of ['googleplex-android-review.googlesource.com/26879000'] into 24Q2-release. Change-Id: Ib7055ebe50e32ac6584d7b7571481bd78d39f363