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