Merge "Move BasicNetworkDemo/NetworkConnect to 2-level structure" into jb-mr2-dev