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