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

Change-Id: I5b7b0ee85ef9bc026248a0168c038b04e10a0505