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

Change-Id: I89e8501e7a1ce25da51a861634a6d1d9c44e87e8