Merge "Removing l2-switch as its causing cyclic dependency."