Merge cherrypicks of ['googleplex-android-review.googlesource.com/39271686', 'googleplex-android-review.googlesource.com/39271688'] into 26Q2-release. Change-Id: I369447d7d3c3b75ed68b9ac16620141f849b9979