Fix cannot save system setting problem

Change-Id: I70415a0e2d487146d9516b5e50881a9209d01c11