Merge cherrypicks of ['googleplex-android-review.googlesource.com/39398570'] into 26Q2-release. Change-Id: I8272de092f4c27b60b5baba4ef0b52d52586a340