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

* commit '90a7b6c9a3cc64b541a8c79fc8c84657d2b694ae':