Revert "Updated DeviceSettings to OMNI ROM"

This reverts commit c5a914c84d24277b31dea355aea11acdbfdd1cea.
Revert "Revert "Updated DeviceSettings to OMNI ROM""

This reverts commit b252f7138de54f712c6b20119591bf0da131651b.
Change to OMNI