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

Change-Id: I58c3914f6dfc6345828acd57e8bae0fa31c83c58