Merge "Remove unused class DrivingStateHelper"