Merge change 21774 into eclair

* changes:
  Implement USIM and add support for importing emails from USIM.