Merge "Revert "[shortcut-fe] Use src and dest IP for interface details""