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