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

Change-Id: I5fb2059be55aeadaac87c0c40024ce6d4c9def32