Merge cherrypicks of ['googleplex-android-review.googlesource.com/26720829', 'googleplex-android-review.googlesource.com/26748903'] into 24Q2-release.

Change-Id: I23f21126a7d7943d26b4e8169505368edcd75854