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