Merge cherrypicks of ['googleplex-android-review.googlesource.com/39299555', 'googleplex-android-review.googlesource.com/39299557'] into 26Q2-release. Change-Id: I46eaae53ff7fed2eb6e876de5138d5a88d7704bb