Merge "Use Log.w(String, String, Throwable tr) instead of Log.w(String, String)"