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