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