Merge cherrypicks of ['android-review.googlesource.com/2982669'] into 24Q2-release. Change-Id: I362f6f09c26bea8862ae1dc731629f4956eed68f