Merge change 21216 into eclair

* changes:
  Fix EAS debug switches and clean up debug prefs code.