Merge cherrypicks of ['googleplex-android-review.googlesource.com/26918937'] into 24Q2-release. Change-Id: If1d9941aaea2262bf77acfa3bf3dcca4437396d1