Merge "Changes related Sync Engine library that communicates to cloud server"