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

Change-Id: I13b9f2ca30340a6b5a11d590106d3200d9dd4d46