Merge "Update a bunch of vendor stuff from CM."