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