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

Change-Id: I4fd0f4bc2e71e0730d36ee254a1a5eadfaf86c1c