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