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

Change-Id: I2ff76f702a247611e5ec0e24a00722ccfb42aba8