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