Merge "Localize "Driver" string and some API cleanup"