Merge "Notify upper layer of deactivation ntf to discovery" am: 34525e174f
am: ffc440c1f8

Change-Id: Ied6d2f3393dc0011077de75d01e3d57ed7b1cc4d