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