Merge cherrypicks of ['android-review.googlesource.com/2902330'] into 24Q2-release.

Change-Id: I508b65f211d64d99bb8413da9f78a3305e664519