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