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

Change-Id: I6a107db8c2fd16f4b81ef6343e1a136e5fb010e9