diff --git a/app/build.gradle b/app/build.gradle
index 2ead26256..588a7da63 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,9 +51,9 @@ dependencies {
     androidTestImplementation "com.android.support:support-annotations:${project.supportLibVersion}"
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
 
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
-    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.1'
+    releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
+    testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
 }
 
 android {
diff --git a/gradle.properties b/gradle.properties
index f7c4bdde9..eeb5ff880 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,4 +14,6 @@ android.useDeprecatedNdk=true
 BUTTERKNIFE_VERSION=8.6.0
 
 org.gradle.jvmargs=-Xmx1536M
+
+#TODO: Temporary disabled. https://developer.android.com/studio/build/gradle-plugin-3-0-0-migration.html#aapt2
 android.enableAapt2=false
\ No newline at end of file