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