moce device options to main settings

Change-Id: I4bdf71b6e166c7e5ef298b54e13170abc0d15d5f