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

Change-Id: I31043aa055c0e9dd7952d78ec5316078debb623c