Register basic notification listener instead of subject listener.

Change-Id: I75a299792bebe6326c502a3b6c7a33c146b5864b