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

Change-Id: I03af838b0a0f27168b7017fa0664a08e8cb3a75e