Merge cherrypicks of ['googleplex-android-review.googlesource.com/25853947'] into 24Q1-release. Change-Id: I424a797173b62776f536c0ab9d3f732d47dc98f4