Merge "Remove STService dependency on model database"