settings: Fix build

Change-Id: Ia6a4bed9e8184f031ef1ef5be90516ca0714ee4f
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0-sgt7