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

Change-Id: I7a37e8ade7423184af4ba3bc7aadbe414353d6dd