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

Change-Id: I6a38a78c17ca2355a52cbd375fbad9731bfc035e