Merge "Add service-adservices.jar files manually as we're past finalization" into tm-dev