Merge cherrypicks of ['android-review.googlesource.com/3157038'] into 24Q3-release. Change-Id: Ia625353098e984c232baeaa050953e66182c4937