am cfee039b: am 90a7b6c9: am a26b12c7: Make sure settings that do not apply to devices (such as clockwork) are handled appropriately. b/17949311

* commit 'cfee039bd47119f5b24ca769c988ed35275ad250':