Ensure yarn.lock matches package.json (#5134)

Ensure yarn.lock matches package.json (#5134) #16844