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

Change-Id: I308bbe24ae73f91bb9b39c132c9e28ba233566cf