Merge "Notification settings update." into oc-dev am: e5493808fd
-s ours am: e79681c5b4
-s ours
am: 2338ef6794
-s ours
Change-Id: I937d3122c5606d13805b53c1e7b9ac73590f8e0a
This commit is contained in: