Remove direct usage of the deprecated notifier location

Internally we should be using the new location and not the
deprecated location wherever possible. This avoids emitting
warnings messages on our own code, which is a dirty habit.

Change-Id: Icc389e61613bc78e64083f0086f6f23aabd243d1
Merge "Remove direct usage of the deprecated notifier location"