Added device settings temporary

Change-Id: I8478ed2bada097770ec4a6299acd1326217aa293