Merge change 23045 into eclair

* changes:
  Add persistent radio prop perms ; cleanup ws and typos.