DeviceSettings Fix

Change-Id: Ie3a0c6dd666f1b76c7057b280037001736687ada