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

Change-Id: Ic2dca5809c0a6ed576f5f0bb98084d979c878a15