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

Change-Id: I8757b07de357b1840429984f1b3140ca2cd79472