Merge "Change notification interruption calculation" into pi-dev am: 65d21a4db7
am: 04be237fd2

Change-Id: Id5694666224579aec371600b7254b2d463a9eefe