diff --git a/build.gradle b/build.gradle
index dbc8a41eb0..d5cc64baa1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,9 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.3'
diff --git a/demos/main/build.gradle b/demos/main/build.gradle
index 029a44326e..099741d167 100644
--- a/demos/main/build.gradle
+++ b/demos/main/build.gradle
@@ -39,9 +39,15 @@ android {
         disable 'MissingTranslation'
     }
 
+    flavorDimensions "extensions"
+
     productFlavors {
-        noExtensions
-        withExtensions
+        noExtensions {
+            dimension "extensions"
+        }
+        withExtensions {
+            dimension "extensions"
+        }
     }
 }