fix device sync errors

Change-Id: I8edaabf93029911673a52dcd084c3ed43605b7f3
remove redundant tool and add todo

Change-Id: Idf82e0eb0024284467a5a3e6fb4b65bfc73863c6