am ea9f9637: Merge change 8338 into donut

Merge commit 'ea9f9637e459c10024d09b53a803dfc91dd3eeb5'

* commit 'ea9f9637e459c10024d09b53a803dfc91dd3eeb5':
  Have the notification service only have notifications diabled until setup wizard has been run.