Merge change 27342 into eclair

* changes:
  Don't back up / restore "allow apps from unknown sources"