Merge cherrypicks of ['googleplex-android-review.googlesource.com/32741066'] into 24Q3-platform-release.

Change-Id: I392db4280d00b0373393cfb729672524d85431e2