Merge change I96cb8d0b into eclair

* changes:
  fix account permission strings.  this permission is used to protect more than just Google accounts.