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

Change-Id: I92ffc07d2dad090f4e2373c4562ce60d660f898e