Merge "Catch exception when notifying Settings changes." into oc-mr1-dev
am: e791b5e778

Change-Id: Idb281592ac72a3bfb56c48bb31f840f39bf6801c