dirty fixing force close

Change-Id: Idc3340e2b150e99675488ca639f316a5ee6f5f7c
device settings

Change-Id: I4bd14346ebd1e73ca846e2ff407ab446aa7ecc15
Merge branch 'Upstream/cm-10.2'