Merge "Remove l2switch sample"