Merge pull request #665 from bhariharan/smart_sync

Adding SmartSyncNetworkManager piece