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

Change-Id: I77556e04b11dd61305ab2305a971d6f9086b79c4