Merge cherrypicks of ['googleplex-android-review.googlesource.com/26480848'] into 24Q1-release. Change-Id: I6ac1984de6bb022fde8eacbe4d005c996a41ce48