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