Merge "Standardize 3rd party library versions"