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

Change-Id: Ic280a211a96e1bbb37994941dc4e6f0543f4cbda