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