Merge "Clean copy from the System Setting lib"