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

Change-Id: Ifbddd3eb2cd9bc1bd82c0734cedc418d8249c506