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

Change-Id: Ia121037db453dd007287e25efde1bd014f433e8e