Notification behavior

Change-Id: I8b297043a8afae81682ad694d933a2961a03fcf3