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