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