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

Change-Id: I2035b793019eed82d0be51f14b8e080706c35c39