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

Change-Id: I72686e6128a2583f0b48a62513770ce34c569b5e