Merge "Revert "sync: remove legacy sync info API""