Merge cherrypicks of ['googleplex-android-review.googlesource.com/26048910', 'googleplex-android-review.googlesource.com/26052935'] into 24Q1-release.

Change-Id: I6c85b5af3d95cb52f30ff6091eb59352b1952186