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

* commit 'da268dae9cdd1aafe9bef9d45fbe12dfb47f9cd9':
  Make sure settings that do not apply to devices (such as clockwork) are handled appropriately. b/17949311