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

Change-Id: I15f92f69fca40d9225905e45aa16be2dfaa1ce22