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