Merge "Notification settings update." into oc-dr1-dev am: cd9224a058
am: eeda4ae540

Change-Id: I3139992a754e69e8ef1e2da858403a0e3b3f3b79