mine NetworkManager

Change-Id: Id1ba688327a016073b351c8bf08af0b80c4b54ce
minor fixes - dht broken?

Change-Id: Ifeb45a1c125dfe9441e30c2a61175bb12ab37351