Merge cherrypicks of ['googleplex-android-review.googlesource.com/39311556', 'googleplex-android-review.googlesource.com/39496581'] into 26Q2-release. Change-Id: I8fd2d645a69d713c623489a6e27f006aa5068d36