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