am 4a864f99: 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 '4a864f9984dc64f423af8e9b13075b3e5198ad07':