Merge change 26146 into eclair

* changes:
  Contacts: create device-local contacts when no Accounts configured.