Merge cherrypicks of ['googleplex-android-review.googlesource.com/40009846'] into 26Q2-release. Change-Id: Ida42573a8cb8030dfeeea7d1f67e2d7f1e964bb6