This change also cleanups preference key string constants Change-Id: I58510f220a90d00d71a935731abeab87384675bb
Change-Id: I3a6821ced8642ab8f954e79a25e31766e4a18eb8