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

Change-Id: I496587aa9090555fb1e548ffa91123c1749682f5