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