AMENDED AND RESTATED COMMERCIAL MANUFACTURING SERVICES AND SUPPLY AGREEMENT