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