Merge "Notification settings can contain dashboard settings" into oc-dev am: 38323f50c7
am: 47101fc1b0

Change-Id: Ibf18f775e0600044519bdf4af7a5d17d8e7ad299