fix

Change-Id: Iad8cb15f7ffbbff3d007dfc6518104214677564e
Merge branch 'mafut' of https://github.com/nelo360/packages_apps_Settings into mafut