Merge "Revert "Revert "Note network interfaces based on transport""" into sc-dev