diff --git a/ISSUE_TEMPLATE b/ISSUE_TEMPLATE
index e85c0c28c7..1b912312d1 100644
--- a/ISSUE_TEMPLATE
+++ b/ISSUE_TEMPLATE
@@ -1,3 +1,5 @@
+*** ISSUES THAT IGNORE THIS TEMPLATE WILL BE CLOSED WITHOUT INVESTIGATION ***
+
 Before filing an issue:
 -----------------------
 - Search existing issues, including issues that are closed.
diff --git a/constants.gradle b/constants.gradle
index e0e8bbcc69..b02e2d4c37 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -26,8 +26,8 @@ project.ext {
     dexmakerVersion = '1.2'
     mockitoVersion = '1.9.5'
     junitVersion = '4.12'
-    truthVersion = '0.35'
-    robolectricVersion = '3.4.2'
+    truthVersion = '0.39'
+    robolectricVersion = '3.7.1'
     releaseVersion = '2.7.0'
     modulePrefix = ':'
     if (gradle.ext.has('exoplayerModulePrefix')) {
diff --git a/library/core/src/test/resources/robolectric.properties b/library/core/src/test/resources/robolectric.properties
new file mode 100644
index 0000000000..2f3210368e
--- /dev/null
+++ b/library/core/src/test/resources/robolectric.properties
@@ -0,0 +1 @@
+manifest=src/test/AndroidManifest.xml