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

Change-Id: Id2f37dd8a23fa2765185a465f36f5d5f17f64f40