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