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

Change-Id: I760516eba72ea9e90eb6a9409258241fc4c1027c