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

Change-Id: I46ef94abbf43fa5511ebce9a9f5e8a7dd85d45ac