Merge snep p2p to master

Change-Id: Ic629c9a2ad348c1f352f39d7fc2be04edcf627e7
17 files changed