Fix FC of DeviceSettings

Change-Id: I5eba79406e9d118577225daf8e9ed16bff510af8