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

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