Notification behavior (1/2)

Change-Id: Ic34a28db14e3b83d3309f9bf238efa095dae0038