am 567ca080: am 64ab5338: Fix regression in removing settings that aren\'t relevant for a platform.

Merge commit '567ca0805e884c124e537edc7eac5cecf8d4e202' into kraken

* commit '567ca0805e884c124e537edc7eac5cecf8d4e202':
  Fix regression in removing settings that aren't relevant for a platform.