Merge cherrypicks of ['googleplex-android-review.googlesource.com/26721962'] into 24Q2-release. Change-Id: I53a0f5b421df2613cba5ef87294e9a7876451b82