am 7d53c697: am d42ab257: Merge change 23045 into eclair

Merge commit '7d53c697caea3259dbc9212044a5ed9dd87a08be'

* commit '7d53c697caea3259dbc9212044a5ed9dd87a08be':
  Add persistent radio prop perms ; cleanup ws and typos.