Merge "Added 17.01 stream for vpp"