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

Change-Id: I11b8d669825e1473574ed40cbc66edd8e7e8b8f3