settings: Fix warnings

Change-Id: I51fae71c7c4f820aeee0479d89ab873993c02a7a
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0