Merge "Clean copy from the System Setting lib"
am: bbf0537a03

Change-Id: I71e2fd76baaf5be0258edb2c82bcd7b4ccd8eddc