Merge "Re-add some CallNotifier implementations." into lmp-dev