Settings: Fix build warnings

Change-Id: I7b3228e3d5e7c25eb2467c4ea2871295480778a5
Merge remote branch 'cm/cm-10.1'