Cherry pick fix for failing test