Merge cherrypicks of ['googleplex-android-review.googlesource.com/39281647', 'googleplex-android-review.googlesource.com/39297918'] into 26Q2-release. Change-Id: I53ff9596e0a0669294d614332127b5c59ab8b5dc