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