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

Change-Id: I4f2f858e9c1aeec22e6be443e87d2cc37dfd8eee