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

* commit '8b0ab50ca8e88bb6807f9b6b64723d904348f710':