Bring notification handling inline with PA

Change-Id: I0d0e9c053c19dc73044664e72e6b964d044227bc