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

Change-Id: Ic80fb8f08fa10da2944aecc6e14f9ee1f07186dc