Merge "Update schema-service dep to 1.6.0"