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