Merge "Notification settings update." into oc-dev am: e5493808fd
am: 7cdc518674
-s ours
am: f1ca862c5a
-s ours
Change-Id: Ia3c60d6751471431432c7b27206b59b22c417958
This commit is contained in: