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

Change-Id: I4d7c784058a50dd74ce5b75f74d57bf4dc66d306