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

Change-Id: I79d3fa701460d6233159e70054ee4dca021f2f76