Johnson steps down from safety top job after conflict of interest accusation