Merge cherrypicks of ['googleplex-android-review.googlesource.com/39515976', 'googleplex-android-review.googlesource.com/39537230'] into 26Q2-release.

Change-Id: Ic7e5996dfb1170f9433dbaaf18a2bebd59e0718f