am a587cd16: am 8598f3ad: Merge "Move BasicNetworkDemo/NetworkConnect to 2-level structure" into jb-mr2-dev

* commit 'a587cd16be0df88e28bc798a4999662b4dc9da8d':
  Move BasicNetworkDemo/NetworkConnect to 2-level structure