Merge "Remove rm_ts_service"