am 1ca1b441: merge from open-source master

Merge commit '1ca1b441b65d55659e2553540f9b75b9749d7fde' into kraken

* commit '1ca1b441b65d55659e2553540f9b75b9749d7fde':
  Removed calls to deprecated APIs and unused imports
  Look at mNumber instead of mName when deciding whether to add or edit a fixed dialling list entry