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

Change-Id: I14acd95da91c99cd4aa3ed334337ce98db3b2d36