Account for scheme when checking if we can handle a call. am: 6afefa40e1
am: a4370801fb

* commit 'a4370801fb81039ced71bf9e2a31fe12f568ea93':
  Account for scheme when checking if we can handle a call.