diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bf2e491..7d7092d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -83,7 +83,9 @@
             android:launchMode="singleTask"
             android:clearTaskOnLaunch="true"
             android:icon="@mipmap/ic_launcher_phone"
-            android:windowSoftInputMode="stateAlwaysHidden|adjustNothing">
+            android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"
+            android:resizeableActivity="true"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.DIAL" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/src/com/android/dialer/util/PhoneNumberUtil.java b/src/com/android/dialer/util/PhoneNumberUtil.java
index 2699803..33f9873 100644
--- a/src/com/android/dialer/util/PhoneNumberUtil.java
+++ b/src/com/android/dialer/util/PhoneNumberUtil.java
@@ -100,7 +100,7 @@
      * @see com.android.i18n.phonenumbers.PhoneNumberOfflineGeocoder
      */
     public static String getGeoDescription(Context context, String number) {
-        Log.v(TAG, "getGeoDescription('" + number + "')...");
+        Log.v(TAG, "getGeoDescription('" + pii(number) + "')...");
 
         if (TextUtils.isEmpty(number)) {
             return null;
@@ -114,13 +114,13 @@
         String countryIso = TelephonyManagerUtils.getCurrentCountryIso(context, locale);
         Phonenumber.PhoneNumber pn = null;
         try {
-            Log.v(TAG, "parsing '" + number
+            Log.v(TAG, "parsing '" + pii(number)
                     + "' for countryIso '" + countryIso + "'...");
             pn = util.parse(number, countryIso);
-            Log.v(TAG, "- parsed number: " + pn);
+            Log.v(TAG, "- parsed number: " + pii(pn));
         } catch (NumberParseException e) {
             Log.v(TAG, "getGeoDescription: NumberParseException for incoming number '" +
-                    number + "'");
+                    pii(number) + "'");
         }
 
         if (pn != null) {
@@ -131,4 +131,8 @@
 
         return null;
     }
+
+    private static String pii(Object pii) {
+        return com.android.incallui.Log.pii(pii);
+    }
 }
