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

Change-Id: I93a5ee90dbd6d52fefcb418819a54278b5b7b690