Correct the way settings deals with subscriptions.

Change-Id: I19e9dfaf248fce7376b124ee91de7e73fdc99fb3
8 files changed