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

Change-Id: I9768a220500b6c0be86c17fa577d9b132f30c25d