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

Change-Id: I7f06458bdb9a744b6e279c63de6a5a31a4f05b6a