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