Check for existence of interface name earlier in code Reviewed-by: michaelm
Set the scope_id_set flag when necessary Reviewed-by: chegar