Merge cherrypicks of ['googleplex-android-review.googlesource.com/30068451'] into 24Q4-release.

Change-Id: If21861e06be4781ab4af912129eadb7483554fe5