Merge "Use new library versions"

No match.