Merge cherrypicks of ['googleplex-android-review.googlesource.com/39311260', 'googleplex-android-review.googlesource.com/39365965'] into 26Q2-release. Change-Id: Ic9eb8dfb6019aff1675257230f25fb4a976b7242