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

Change-Id: Icbe5bd9608758f512093be1c20bd27ee355e716e