Move lines to sony/viskan-common