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

Change-Id: I5086af46494b19c34050939aff2b503f507f6442