Merge "Kqueen service support for Drivetrain"