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

Change-Id: I69565dfa3fb7f09545e71e873ee0b904ac3f145e