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

Change-Id: Ib1d35c7f7910404a07e106fcb4f9dd169de47ca5