diff --git a/src/com/android/telecomm/CallsManager.java b/src/com/android/telecomm/CallsManager.java
index d41f483..7aeaed5 100644
--- a/src/com/android/telecomm/CallsManager.java
+++ b/src/com/android/telecomm/CallsManager.java
@@ -215,7 +215,7 @@
         final Uri uriHandle = (gatewayInfo == null) ? handle : gatewayInfo.getGatewayHandle();
 
         if (gatewayInfo == null) {
-            Log.i(this, "Creating a new outgoing call with handle: %s", Log.pii(uriHandle));
+            Log.i(this, "Creating a new outgoing call with handle: %s", Log.piiHandle(uriHandle));
         } else {
             Log.i(this, "Creating a new outgoing call with gateway handle: %s, original handle: %s",
                     Log.pii(uriHandle), Log.pii(handle));
diff --git a/src/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java b/src/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
index 324c25e..41d568f 100644
--- a/src/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
+++ b/src/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
@@ -159,7 +159,9 @@
             return;
         }
 
-        if (!PhoneNumberUtils.isUriNumber(handle)) {
+        boolean isUriNumber = PhoneNumberUtils.isUriNumber(handle);
+
+        if (!isUriNumber) {
             handle = PhoneNumberUtils.convertKeypadLettersToDigits(handle);
             handle = PhoneNumberUtils.stripSeparators(handle);
         }
@@ -195,7 +197,9 @@
         if (callImmediately) {
             Log.i(this, "Placing call immediately instead of waiting for "
                     + " OutgoingCallBroadcastReceiver: %s", intent);
-            mCallsManager.placeOutgoingCall(Uri.parse(handle), mContactInfo, null);
+            String scheme = isUriNumber ? SCHEME_SIP : SCHEME_TEL;
+            mCallsManager.placeOutgoingCall(
+                    Uri.fromParts(scheme, handle, null), mContactInfo, null);
 
             // Don't return but instead continue and send the ACTION_NEW_OUTGOING_CALL broadcast
             // so that third parties can still inspect (but not intercept) the outgoing call. When