Merge change 20663

* changes:
  Update getNumberFromIntent() to read from both providers.