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

Change-Id: I22d96e1d02f9a5a19f0eae1db368ad71d9de9b7b