Merge cherrypicks of ['googleplex-android-review.googlesource.com/28709102'] into 24Q3-release.

Change-Id: I093a4c1a90289261110759e3dd9c80749488f1b7