Merge cherrypicks of ['googleplex-android-review.googlesource.com/28994964'] into 24Q3-release. Change-Id: I86e795e6b85a944cbebf928772dcc1154d35e034