Fixed bug TDIS-7234 and reconstruct notification code

Signed-off-by: wangjun <junx.j.wang@intel.com>