[go: nahoru, domu]

Updates prebuilts for codelabs and small fixes

Change-Id: Ibe290ec2ecf55a00632fb93e2071ee894d34443f
diff --git a/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_1.xml b/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_1.xml
index 09c7052..0dfbdcb 100644
--- a/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_1.xml
+++ b/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_1.xml
@@ -40,7 +40,7 @@
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
     </Native>
     <Profilers>
-      <option name="ENABLE_ADVANCED_PROFILING" value="false" />
+      <option name="ENABLE_ADVANCED_PROFILING" value="true" />
       <option name="SUPPORT_LIB_ENABLED" value="true" />
       <option name="INSTRUMENTATION_ENABLED" value="true" />
     </Profilers>
diff --git a/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_2.xml b/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_2___ViewModel.xml
similarity index 90%
rename from samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_2.xml
rename to samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_2___ViewModel.xml
index e0f1f0d..7d2f95d 100644
--- a/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_2.xml
+++ b/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_2___ViewModel.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Step 2" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
+  <configuration default="false" name="Step 2 - ViewModel" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
     <module name="app" />
     <option name="DEPLOY" value="true" />
     <option name="ARTIFACT_NAME" value="" />
@@ -40,7 +40,7 @@
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
     </Native>
     <Profilers>
-      <option name="ENABLE_ADVANCED_PROFILING" value="false" />
+      <option name="ENABLE_ADVANCED_PROFILING" value="true" />
       <option name="SUPPORT_LIB_ENABLED" value="true" />
       <option name="INSTRUMENTATION_ENABLED" value="true" />
     </Profilers>
diff --git a/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_3.xml b/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_3.xml
deleted file mode 100644
index ac48e5e..0000000
--- a/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_3.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Step 3" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="app" />
-    <option name="DEPLOY" value="true" />
-    <option name="ARTIFACT_NAME" value="" />
-    <option name="PM_INSTALL_OPTIONS" value="" />
-    <option name="ACTIVITY_EXTRA_FLAGS" value="" />
-    <option name="MODE" value="specific_activity" />
-    <option name="PREFERRED_AVD" value="" />
-    <option name="CLEAR_LOGCAT" value="false" />
-    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
-    <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-    <option name="FORCE_STOP_RUNNING_APP" value="true" />
-    <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-    <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-    <option name="PREFERRED_AVD" value="" />
-    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
-    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
-    <option name="DEBUGGER_TYPE" value="Auto" />
-    <Auto>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Auto>
-    <Hybrid>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Hybrid>
-    <Java />
-    <Native>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Native>
-    <Profilers>
-      <option name="ENABLE_ADVANCED_PROFILING" value="false" />
-      <option name="SUPPORT_LIB_ENABLED" value="true" />
-      <option name="INSTRUMENTATION_ENABLED" value="true" />
-    </Profilers>
-    <option name="DEEP_LINK" value="" />
-    <option name="ACTIVITY_CLASS" value="com.example.android.lifecycles.step3.ChronoActivity3" />
-    <method />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_5___solution.xml b/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_3___LiveData.xml
similarity index 92%
rename from samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_5___solution.xml
rename to samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_3___LiveData.xml
index 43cc8ba..c924446 100644
--- a/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_5___solution.xml
+++ b/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_3___LiveData.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Step 5 - solution" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
+  <configuration default="false" name="Step 3 - LiveData" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
     <module name="app" />
     <option name="DEPLOY" value="true" />
     <option name="ARTIFACT_NAME" value="" />
@@ -40,12 +40,12 @@
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
     </Native>
     <Profilers>
-      <option name="ENABLE_ADVANCED_PROFILING" value="false" />
+      <option name="ENABLE_ADVANCED_PROFILING" value="true" />
       <option name="SUPPORT_LIB_ENABLED" value="true" />
       <option name="INSTRUMENTATION_ENABLED" value="true" />
     </Profilers>
     <option name="DEEP_LINK" value="" />
-    <option name="ACTIVITY_CLASS" value="com.example.android.lifecycles.step5_solution.Activity_step5" />
+    <option name="ACTIVITY_CLASS" value="com.example.android.lifecycles.step3.ChronoActivity3" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_3___solution.xml b/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_3___LiveData_solution.xml
similarity index 90%
rename from samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_3___solution.xml
rename to samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_3___LiveData_solution.xml
index ab8528d..546a8ad 100644
--- a/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_3___solution.xml
+++ b/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_3___LiveData_solution.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Step 3 - solution" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
+  <configuration default="false" name="Step 3 - LiveData solution" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
     <module name="app" />
     <option name="DEPLOY" value="true" />
     <option name="ARTIFACT_NAME" value="" />
@@ -40,7 +40,7 @@
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
     </Native>
     <Profilers>
-      <option name="ENABLE_ADVANCED_PROFILING" value="false" />
+      <option name="ENABLE_ADVANCED_PROFILING" value="true" />
       <option name="SUPPORT_LIB_ENABLED" value="true" />
       <option name="INSTRUMENTATION_ENABLED" value="true" />
     </Profilers>
diff --git a/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_4___Lifecycle_provider.xml b/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_4___Lifecycle_provider.xml
index 3f28cef..c23cba6 100644
--- a/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_4___Lifecycle_provider.xml
+++ b/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_4___Lifecycle_provider.xml
@@ -40,7 +40,7 @@
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
     </Native>
     <Profilers>
-      <option name="ENABLE_ADVANCED_PROFILING" value="false" />
+      <option name="ENABLE_ADVANCED_PROFILING" value="true" />
       <option name="SUPPORT_LIB_ENABLED" value="true" />
       <option name="INSTRUMENTATION_ENABLED" value="true" />
     </Profilers>
diff --git a/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_4___Lifecycle_provider_solution.xml b/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_4___Lifecycle_provider_solution.xml
index b05bb51..01c21e4 100644
--- a/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_4___Lifecycle_provider_solution.xml
+++ b/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_4___Lifecycle_provider_solution.xml
@@ -40,7 +40,7 @@
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
     </Native>
     <Profilers>
-      <option name="ENABLE_ADVANCED_PROFILING" value="false" />
+      <option name="ENABLE_ADVANCED_PROFILING" value="true" />
       <option name="SUPPORT_LIB_ENABLED" value="true" />
       <option name="INSTRUMENTATION_ENABLED" value="true" />
     </Profilers>
diff --git a/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_5.xml b/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_5___Sharing_VMs.xml
similarity index 90%
rename from samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_5.xml
rename to samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_5___Sharing_VMs.xml
index d76af72..55b1e43 100644
--- a/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_5.xml
+++ b/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_5___Sharing_VMs.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Step 5" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
+  <configuration default="false" name="Step 5 - Sharing VMs" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
     <module name="app" />
     <option name="DEPLOY" value="true" />
     <option name="ARTIFACT_NAME" value="" />
@@ -40,7 +40,7 @@
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
     </Native>
     <Profilers>
-      <option name="ENABLE_ADVANCED_PROFILING" value="false" />
+      <option name="ENABLE_ADVANCED_PROFILING" value="true" />
       <option name="SUPPORT_LIB_ENABLED" value="true" />
       <option name="INSTRUMENTATION_ENABLED" value="true" />
     </Profilers>
diff --git a/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_5___solution.xml b/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_5___Sharing_VMs_solution.xml
similarity index 90%
copy from samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_5___solution.xml
copy to samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_5___Sharing_VMs_solution.xml
index 43cc8ba..a060505 100644
--- a/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_5___solution.xml
+++ b/samples-flatfoot/codelabs/lifecycle/.idea/runConfigurations/Step_5___Sharing_VMs_solution.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Step 5 - solution" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
+  <configuration default="false" name="Step 5 - Sharing VMs solution" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
     <module name="app" />
     <option name="DEPLOY" value="true" />
     <option name="ARTIFACT_NAME" value="" />
@@ -40,7 +40,7 @@
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
     </Native>
     <Profilers>
-      <option name="ENABLE_ADVANCED_PROFILING" value="false" />
+      <option name="ENABLE_ADVANCED_PROFILING" value="true" />
       <option name="SUPPORT_LIB_ENABLED" value="true" />
       <option name="INSTRUMENTATION_ENABLED" value="true" />
     </Profilers>
diff --git a/samples-flatfoot/codelabs/lifecycle/app/build.gradle b/samples-flatfoot/codelabs/lifecycle/app/build.gradle
index b2e8feb..7a9e955 100644
--- a/samples-flatfoot/codelabs/lifecycle/app/build.gradle
+++ b/samples-flatfoot/codelabs/lifecycle/app/build.gradle
@@ -42,15 +42,15 @@
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestCompile('com.android.support.test.espresso:espresso-core:' + rootProject.espressoVersion, {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:cardview-v7:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile 'com.android.support.lifecycle:extensions:1.0-SNAPSHOT'
-    compile 'com.android.support.room:runtime:1.0-SNAPSHOT'
+    compile 'com.android.support:appcompat-v7:' + rootProject.supportLibVersion;
+    compile 'com.android.support:cardview-v7:' + rootProject.supportLibVersion;
+    compile 'com.android.support:recyclerview-v7:' + rootProject.supportLibVersion;
     testCompile 'junit:junit:4.12'
-    annotationProcessor 'com.android.support.lifecycle:compiler:1.0-SNAPSHOT'
-    annotationProcessor 'com.android.support.room:compiler:1.0-SNAPSHOT'
+    compile 'android.arch.lifecycle:extensions:' + rootProject.archLifecycleVersion;
+    compile 'android.arch.persistence.room:runtime:' + rootProject.archRoomVersion;
+    annotationProcessor 'android.arch.lifecycle:compiler:' + rootProject.archLifecycleVersion;
+    annotationProcessor 'android.arch.persistence.room:compiler:' + rootProject.archRoomVersion;
 }
diff --git a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step2/ChronoActivity2.java b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step2/ChronoActivity2.java
index 132f023..4ef5e23 100644
--- a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step2/ChronoActivity2.java
+++ b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step2/ChronoActivity2.java
@@ -20,8 +20,8 @@
 import android.os.SystemClock;
 import android.widget.Chronometer;
 
-import com.android.support.lifecycle.LifecycleActivity;
-import com.android.support.lifecycle.ViewModelProviders;
+import android.arch.lifecycle.LifecycleActivity;
+import android.arch.lifecycle.ViewModelProviders;
 import com.example.android.codelabs.lifecycle.R;
 
 public class ChronoActivity2 extends LifecycleActivity {
diff --git a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step2/ChronometerViewModel.java b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step2/ChronometerViewModel.java
index 0511d7d..136ed50 100644
--- a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step2/ChronometerViewModel.java
+++ b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step2/ChronometerViewModel.java
@@ -18,7 +18,7 @@
 
 import android.support.annotation.Nullable;
 
-import com.android.support.lifecycle.ViewModel;
+import android.arch.lifecycle.ViewModel;
 
 /**
  * A ViewModel used for the {@link ChronoActivity2}.
diff --git a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step3/ChronoActivity3.java b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step3/ChronoActivity3.java
index 979a4ad..4ff1a87 100644
--- a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step3/ChronoActivity3.java
+++ b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step3/ChronoActivity3.java
@@ -21,9 +21,9 @@
 import android.util.Log;
 import android.widget.TextView;
 
-import com.android.support.lifecycle.LifecycleActivity;
-import com.android.support.lifecycle.Observer;
-import com.android.support.lifecycle.ViewModelProviders;
+import android.arch.lifecycle.LifecycleActivity;
+import android.arch.lifecycle.Observer;
+import android.arch.lifecycle.ViewModelProviders;
 import com.example.android.codelabs.lifecycle.R;
 
 
diff --git a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step3/LiveDataTimerViewModel.java b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step3/LiveDataTimerViewModel.java
index da76a19..5da2b17 100644
--- a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step3/LiveDataTimerViewModel.java
+++ b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step3/LiveDataTimerViewModel.java
@@ -20,8 +20,8 @@
 import android.os.Looper;
 import android.os.SystemClock;
 
-import com.android.support.lifecycle.LiveData;
-import com.android.support.lifecycle.ViewModel;
+import android.arch.lifecycle.LiveData;
+import android.arch.lifecycle.ViewModel;
 
 import java.util.Timer;
 import java.util.TimerTask;
diff --git a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step3_solution/ChronoActivity3.java b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step3_solution/ChronoActivity3.java
index 92ba3e7..2caf5fb6 100644
--- a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step3_solution/ChronoActivity3.java
+++ b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step3_solution/ChronoActivity3.java
@@ -21,9 +21,9 @@
 import android.util.Log;
 import android.widget.TextView;
 
-import com.android.support.lifecycle.LifecycleActivity;
-import com.android.support.lifecycle.Observer;
-import com.android.support.lifecycle.ViewModelProviders;
+import android.arch.lifecycle.LifecycleActivity;
+import android.arch.lifecycle.Observer;
+import android.arch.lifecycle.ViewModelProviders;
 import com.example.android.codelabs.lifecycle.R;
 
 public class ChronoActivity3 extends LifecycleActivity {
diff --git a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step3_solution/LiveDataTimerViewModel.java b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step3_solution/LiveDataTimerViewModel.java
index 4697f5c..2644415 100644
--- a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step3_solution/LiveDataTimerViewModel.java
+++ b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step3_solution/LiveDataTimerViewModel.java
@@ -16,12 +16,13 @@
 
 package com.example.android.lifecycles.step3_solution;
 
+import android.arch.lifecycle.MutableLiveData;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
 
-import com.android.support.lifecycle.LiveData;
-import com.android.support.lifecycle.ViewModel;
+import android.arch.lifecycle.LiveData;
+import android.arch.lifecycle.ViewModel;
 
 import java.util.Timer;
 import java.util.TimerTask;
@@ -33,7 +34,7 @@
 
     private static final int ONE_SECOND = 1000;
 
-    private LiveData<Long> elapsedTime = new LiveData<>();
+    private MutableLiveData<Long> elapsedTime = new MutableLiveData<>();
 
     private long mInitialTime;
 
diff --git a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step4/BoundLocationManager.java b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step4/BoundLocationManager.java
index 9b6c54c..ad38c4a 100644
--- a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step4/BoundLocationManager.java
+++ b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step4/BoundLocationManager.java
@@ -22,8 +22,8 @@
 import android.location.LocationManager;
 import android.util.Log;
 
-import com.android.support.lifecycle.LifecycleObserver;
-import com.android.support.lifecycle.LifecycleRegistryOwner;
+import android.arch.lifecycle.LifecycleObserver;
+import android.arch.lifecycle.LifecycleRegistryOwner;
 
 
 public class BoundLocationManager {
diff --git a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step4/LocationActivity.java b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step4/LocationActivity.java
index 3b8a7b1..4712267 100644
--- a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step4/LocationActivity.java
+++ b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step4/LocationActivity.java
@@ -26,7 +26,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.android.support.lifecycle.LifecycleActivity;
+import android.arch.lifecycle.LifecycleActivity;
 import com.example.android.codelabs.lifecycle.R;
 
 public class LocationActivity extends LifecycleActivity {
diff --git a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step4_solution/BoundLocationManager.java b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step4_solution/BoundLocationManager.java
index 52f63cd..4360c2a 100644
--- a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step4_solution/BoundLocationManager.java
+++ b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step4_solution/BoundLocationManager.java
@@ -16,19 +16,18 @@
 
 package com.example.android.lifecycles.step4_solution;
 
+import android.arch.lifecycle.Lifecycle;
+import android.arch.lifecycle.LifecycleObserver;
+import android.arch.lifecycle.LifecycleOwner;
+import android.arch.lifecycle.OnLifecycleEvent;
 import android.content.Context;
 import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.util.Log;
 
-import com.android.support.lifecycle.Lifecycle;
-import com.android.support.lifecycle.LifecycleObserver;
-import com.android.support.lifecycle.LifecycleRegistryOwner;
-import com.android.support.lifecycle.OnLifecycleEvent;
-
 public class BoundLocationManager {
-    public static void bindLocationListenerIn(LifecycleRegistryOwner lifecycleOwner,
+    public static void bindLocationListenerIn(LifecycleOwner lifecycleOwner,
                                               LocationListener listener, Context context) {
         new BoundLocationListener(lifecycleOwner, listener, context);
     }
@@ -39,14 +38,14 @@
         private LocationManager mLocationManager;
         private final LocationListener mListener;
 
-        public BoundLocationListener(LifecycleRegistryOwner lifecycleOwner,
+        public BoundLocationListener(LifecycleOwner lifecycleOwner,
                                      LocationListener listener, Context context) {
             mContext = context;
             mListener = listener;
             lifecycleOwner.getLifecycle().addObserver(this);
         }
 
-        @OnLifecycleEvent(Lifecycle.ON_RESUME)
+        @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
         void addLocationListener() {
             // Note: Use the Fused Location Provider from Google Play Services instead.
             // https://developers.google.com/android/reference/com/google/android/gms/location/FusedLocationProviderApi
@@ -65,7 +64,7 @@
         }
 
 
-        @OnLifecycleEvent(Lifecycle.ON_PAUSE)
+        @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
         void removeLocationListener() {
             if (mLocationManager == null) {
                 return;
diff --git a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step4_solution/LocationActivity.java b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step4_solution/LocationActivity.java
index 71cdd89..79ff562 100644
--- a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step4_solution/LocationActivity.java
+++ b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step4_solution/LocationActivity.java
@@ -26,7 +26,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.android.support.lifecycle.LifecycleActivity;
+import android.arch.lifecycle.LifecycleActivity;
 import com.example.android.codelabs.lifecycle.R;
 
 public class LocationActivity extends LifecycleActivity {
diff --git a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step5/Activity_step5.java b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step5/Activity_step5.java
index 61f877f..ec6df9a 100644
--- a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step5/Activity_step5.java
+++ b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step5/Activity_step5.java
@@ -18,7 +18,7 @@
 
 import android.os.Bundle;
 
-import com.android.support.lifecycle.LifecycleActivity;
+import android.arch.lifecycle.LifecycleActivity;
 import com.example.android.codelabs.lifecycle.R;
 
 /**
diff --git a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step5/SeekBarViewModel.java b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step5/SeekBarViewModel.java
index dd963fd..5811a19 100644
--- a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step5/SeekBarViewModel.java
+++ b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step5/SeekBarViewModel.java
@@ -16,13 +16,13 @@
 
 package com.example.android.lifecycles.step5;
 
-import com.android.support.lifecycle.LiveData;
-import com.android.support.lifecycle.ViewModel;
+import android.arch.lifecycle.MutableLiveData;
+import android.arch.lifecycle.ViewModel;
 
 /**
  * A ViewModel used in step 5.
  */
 public class SeekBarViewModel extends ViewModel {
 
-    public LiveData<Integer> seekbarValue = new LiveData<>();
+    public MutableLiveData<Integer> seekbarValue = new MutableLiveData<>();
 }
diff --git a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step5_solution/Activity_step5.java b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step5_solution/Activity_step5.java
index fe257dd..89fe54b 100644
--- a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step5_solution/Activity_step5.java
+++ b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step5_solution/Activity_step5.java
@@ -18,7 +18,7 @@
 
 import android.os.Bundle;
 
-import com.android.support.lifecycle.LifecycleActivity;
+import android.arch.lifecycle.LifecycleActivity;
 import com.example.android.codelabs.lifecycle.R;
 
 /**
diff --git a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step5_solution/Fragment_step5.java b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step5_solution/Fragment_step5.java
index 4d2a8c0..f82eb87 100644
--- a/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step5_solution/Fragment_step5.java
+++ b/samples-flatfoot/codelabs/lifecycle/app/src/main/java/com/example/android/lifecycles/step5_solution/Fragment_step5.java
@@ -17,6 +17,9 @@
 package com.example.android.lifecycles.step5_solution;
 
 
+import android.arch.lifecycle.LifecycleOwner;
+import android.arch.lifecycle.Observer;
+import android.arch.lifecycle.ViewModelProviders;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
@@ -26,9 +29,6 @@
 import android.view.ViewGroup;
 import android.widget.SeekBar;
 
-import com.android.support.lifecycle.LifecycleOwner;
-import com.android.support.lifecycle.Observer;
-import com.android.support.lifecycle.ViewModelProviders;
 import com.example.android.codelabs.lifecycle.R;
 import com.example.android.lifecycles.step5.SeekBarViewModel;
 
diff --git a/samples-flatfoot/codelabs/lifecycle/build.gradle b/samples-flatfoot/codelabs/lifecycle/build.gradle
index d91dde3..2d9ee91 100644
--- a/samples-flatfoot/codelabs/lifecycle/build.gradle
+++ b/samples-flatfoot/codelabs/lifecycle/build.gradle
@@ -32,7 +32,7 @@
     repositories {
         jcenter()
         maven {
-            url "../../prebuilts"
+            url "../../prebuilts2604"
         }
     }
 }
@@ -40,3 +40,13 @@
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+ext {
+    buildToolsVersion = "25.0.2"
+    supportLibVersion = "25.3.1"
+    runnerVersion = "0.5"
+    rulesVersion = "0.5"
+    espressoVersion = "2.2.2"
+    archLifecycleVersion = "1.0-SNAPSHOT"
+    archRoomVersion = "1.0-SNAPSHOT"
+}
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_1___Dao.xml b/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_1___Dao.xml
index 4cfca5a..c4fb918 100644
--- a/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_1___Dao.xml
+++ b/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_1___Dao.xml
@@ -40,7 +40,7 @@
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
     </Native>
     <Profilers>
-      <option name="ENABLE_ADVANCED_PROFILING" value="false" />
+      <option name="ENABLE_ADVANCED_PROFILING" value="true" />
       <option name="SUPPORT_LIB_ENABLED" value="true" />
       <option name="INSTRUMENTATION_ENABLED" value="true" />
     </Profilers>
diff --git a/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_1___Solution.xml b/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_1___Solution.xml
index 0c1c26d..b047801 100644
--- a/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_1___Solution.xml
+++ b/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_1___Solution.xml
@@ -40,7 +40,7 @@
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
     </Native>
     <Profilers>
-      <option name="ENABLE_ADVANCED_PROFILING" value="false" />
+      <option name="ENABLE_ADVANCED_PROFILING" value="true" />
       <option name="SUPPORT_LIB_ENABLED" value="true" />
       <option name="INSTRUMENTATION_ENABLED" value="true" />
     </Profilers>
diff --git a/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_2___Relationships.xml b/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_2___Relationships.xml
index 4c2c0db..17fe2f9 100644
--- a/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_2___Relationships.xml
+++ b/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_2___Relationships.xml
@@ -40,7 +40,7 @@
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
     </Native>
     <Profilers>
-      <option name="ENABLE_ADVANCED_PROFILING" value="false" />
+      <option name="ENABLE_ADVANCED_PROFILING" value="true" />
       <option name="SUPPORT_LIB_ENABLED" value="true" />
       <option name="INSTRUMENTATION_ENABLED" value="true" />
     </Profilers>
diff --git a/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_3___Async_calls.xml b/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_3___Async_calls.xml
index 42ebf57..28ddac1 100644
--- a/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_3___Async_calls.xml
+++ b/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_3___Async_calls.xml
@@ -40,7 +40,7 @@
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
     </Native>
     <Profilers>
-      <option name="ENABLE_ADVANCED_PROFILING" value="false" />
+      <option name="ENABLE_ADVANCED_PROFILING" value="true" />
       <option name="SUPPORT_LIB_ENABLED" value="true" />
       <option name="INSTRUMENTATION_ENABLED" value="true" />
     </Profilers>
diff --git a/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_3___Solution.xml b/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_3___Solution.xml
index 8fc8764..38fcfb3 100644
--- a/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_3___Solution.xml
+++ b/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_3___Solution.xml
@@ -40,7 +40,7 @@
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
     </Native>
     <Profilers>
-      <option name="ENABLE_ADVANCED_PROFILING" value="false" />
+      <option name="ENABLE_ADVANCED_PROFILING" value="true" />
       <option name="SUPPORT_LIB_ENABLED" value="true" />
       <option name="INSTRUMENTATION_ENABLED" value="true" />
     </Profilers>
diff --git a/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_4___Solution.xml b/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_4___Solution.xml
index 03c5fbb..094bac9 100644
--- a/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_4___Solution.xml
+++ b/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_4___Solution.xml
@@ -40,7 +40,7 @@
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
     </Native>
     <Profilers>
-      <option name="ENABLE_ADVANCED_PROFILING" value="false" />
+      <option name="ENABLE_ADVANCED_PROFILING" value="true" />
       <option name="SUPPORT_LIB_ENABLED" value="true" />
       <option name="INSTRUMENTATION_ENABLED" value="true" />
     </Profilers>
diff --git a/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_4___Type_converters.xml b/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_4___Type_converters.xml
index 26f0df7..d75817c 100644
--- a/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_4___Type_converters.xml
+++ b/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_4___Type_converters.xml
@@ -40,7 +40,7 @@
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
     </Native>
     <Profilers>
-      <option name="ENABLE_ADVANCED_PROFILING" value="false" />
+      <option name="ENABLE_ADVANCED_PROFILING" value="true" />
       <option name="SUPPORT_LIB_ENABLED" value="true" />
       <option name="INSTRUMENTATION_ENABLED" value="true" />
     </Profilers>
diff --git a/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_5___Custom_Results.xml b/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_5___Custom_Results.xml
index e3555d2..3dcf7f5 100644
--- a/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_5___Custom_Results.xml
+++ b/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_5___Custom_Results.xml
@@ -40,7 +40,7 @@
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
     </Native>
     <Profilers>
-      <option name="ENABLE_ADVANCED_PROFILING" value="false" />
+      <option name="ENABLE_ADVANCED_PROFILING" value="true" />
       <option name="SUPPORT_LIB_ENABLED" value="true" />
       <option name="INSTRUMENTATION_ENABLED" value="true" />
     </Profilers>
diff --git a/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_5___Solution.xml b/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_5___Solution.xml
index 790b28c..342cb95 100644
--- a/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_5___Solution.xml
+++ b/samples-flatfoot/codelabs/persistence/.idea/runConfigurations/Step_5___Solution.xml
@@ -40,7 +40,7 @@
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
     </Native>
     <Profilers>
-      <option name="ENABLE_ADVANCED_PROFILING" value="false" />
+      <option name="ENABLE_ADVANCED_PROFILING" value="true" />
       <option name="SUPPORT_LIB_ENABLED" value="true" />
       <option name="INSTRUMENTATION_ENABLED" value="true" />
     </Profilers>
diff --git a/samples-flatfoot/codelabs/persistence/app/build.gradle b/samples-flatfoot/codelabs/persistence/app/build.gradle
index 7ec8d5f..0a382b4 100644
--- a/samples-flatfoot/codelabs/persistence/app/build.gradle
+++ b/samples-flatfoot/codelabs/persistence/app/build.gradle
@@ -47,15 +47,15 @@
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestCompile('com.android.support.test.espresso:espresso-core:' + rootProject.espressoVersion, {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:cardview-v7:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
+    compile 'com.android.support:appcompat-v7:' + rootProject.supportLibVersion;
+    compile 'com.android.support:cardview-v7:' + rootProject.supportLibVersion;
+    compile 'com.android.support:recyclerview-v7:' + rootProject.supportLibVersion;
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support.lifecycle:extensions:1.0-SNAPSHOT'
-    compile 'com.android.support.room:runtime:1.0-SNAPSHOT'
-    annotationProcessor "com.android.support.lifecycle:compiler:1.0-SNAPSHOT"
-    annotationProcessor "com.android.support.room:compiler:1.0-SNAPSHOT"
+    compile 'android.arch.lifecycle:extensions:' + rootProject.archLifecycleVersion;
+    compile 'android.arch.persistence.room:runtime:' + rootProject.archRoomVersion;
+    annotationProcessor 'android.arch.lifecycle:compiler:' + rootProject.archLifecycleVersion;
+    annotationProcessor 'android.arch.persistence.room:compiler:' + rootProject.archRoomVersion;
 }
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/AppDatabase.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/AppDatabase.java
index eb0ad34..4399a84 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/AppDatabase.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/AppDatabase.java
@@ -18,9 +18,9 @@
 
 import android.content.Context;
 
-import com.android.support.room.Database;
-import com.android.support.room.Room;
-import com.android.support.room.RoomDatabase;
+import android.arch.persistence.room.Database;
+import android.arch.persistence.room.Room;
+import android.arch.persistence.room.RoomDatabase;
 
 @Database(entities = {User.class, Book.class, Loan.class}, version = 1)
 public abstract class AppDatabase extends RoomDatabase {
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/Book.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/Book.java
index 9e5cea6..5b3cd39 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/Book.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/Book.java
@@ -16,8 +16,8 @@
 
 package com.example.android.persistence.codelab.db;
 
-import com.android.support.room.Entity;
-import com.android.support.room.PrimaryKey;
+import android.arch.persistence.room.Entity;
+import android.arch.persistence.room.PrimaryKey;
 
 @Entity
 public class Book {
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/BookDao.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/BookDao.java
index f5a717f..13b984d 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/BookDao.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/BookDao.java
@@ -16,18 +16,18 @@
 
 package com.example.android.persistence.codelab.db;
 
-import com.android.support.lifecycle.LiveData;
-import com.android.support.room.Dao;
-import com.android.support.room.Insert;
-import com.android.support.room.Query;
-import com.android.support.room.TypeConverters;
-import com.android.support.room.Update;
+import android.arch.lifecycle.LiveData;
+import android.arch.persistence.room.Dao;
+import android.arch.persistence.room.Insert;
+import android.arch.persistence.room.Query;
+import android.arch.persistence.room.TypeConverters;
+import android.arch.persistence.room.Update;
 
 import java.util.Date;
 import java.util.List;
 
-import static com.android.support.room.OnConflictStrategy.IGNORE;
-import static com.android.support.room.OnConflictStrategy.REPLACE;
+import static android.arch.persistence.room.OnConflictStrategy.IGNORE;
+import static android.arch.persistence.room.OnConflictStrategy.REPLACE;
 
 
 @Dao
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/DateConverter.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/DateConverter.java
index 3cc0771..f7ad1d6 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/DateConverter.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/DateConverter.java
@@ -16,7 +16,7 @@
 
 package com.example.android.persistence.codelab.db;
 
-import com.android.support.room.TypeConverter;
+import android.arch.persistence.room.TypeConverter;
 
 import java.util.Date;
 
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/Loan.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/Loan.java
index c14c5c0..39e8a89 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/Loan.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/Loan.java
@@ -16,11 +16,11 @@
 
 package com.example.android.persistence.codelab.db;
 
-import com.android.support.room.ColumnInfo;
-import com.android.support.room.Entity;
-import com.android.support.room.ForeignKey;
-import com.android.support.room.PrimaryKey;
-import com.android.support.room.TypeConverters;
+import android.arch.persistence.room.ColumnInfo;
+import android.arch.persistence.room.Entity;
+import android.arch.persistence.room.ForeignKey;
+import android.arch.persistence.room.PrimaryKey;
+import android.arch.persistence.room.TypeConverters;
 
 import java.util.Date;
 
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/LoanDao.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/LoanDao.java
index 781d030..5a8f9ed 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/LoanDao.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/LoanDao.java
@@ -17,16 +17,16 @@
 package com.example.android.persistence.codelab.db;
 
 
-import com.android.support.lifecycle.LiveData;
-import com.android.support.room.Dao;
-import com.android.support.room.Insert;
-import com.android.support.room.Query;
-import com.android.support.room.TypeConverters;
+import android.arch.lifecycle.LiveData;
+import android.arch.persistence.room.Dao;
+import android.arch.persistence.room.Insert;
+import android.arch.persistence.room.Query;
+import android.arch.persistence.room.TypeConverters;
 
 import java.util.Date;
 import java.util.List;
 
-import static com.android.support.room.OnConflictStrategy.ABORT;
+import static android.arch.persistence.room.OnConflictStrategy.ABORT;
 
 @Dao
 @TypeConverters(DateConverter.class)
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/LoanWithUserAndBook.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/LoanWithUserAndBook.java
index 204ef6f..9df2dda 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/LoanWithUserAndBook.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/LoanWithUserAndBook.java
@@ -16,8 +16,8 @@
 
 package com.example.android.persistence.codelab.db;
 
-import com.android.support.room.ColumnInfo;
-import com.android.support.room.TypeConverters;
+import android.arch.persistence.room.ColumnInfo;
+import android.arch.persistence.room.TypeConverters;
 
 import java.util.Date;
 
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/User.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/User.java
index b1d71dd..75dc4b3 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/User.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/User.java
@@ -16,8 +16,8 @@
 
 package com.example.android.persistence.codelab.db;
 
-import com.android.support.room.Entity;
-import com.android.support.room.PrimaryKey;
+import android.arch.persistence.room.Entity;
+import android.arch.persistence.room.PrimaryKey;
 
 
 @Entity
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/UserDao.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/UserDao.java
index c993372..49a4403 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/UserDao.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/db/UserDao.java
@@ -16,14 +16,14 @@
 
 package com.example.android.persistence.codelab.db;
 
-import com.android.support.room.Dao;
-import com.android.support.room.Delete;
-import com.android.support.room.Insert;
-import com.android.support.room.Query;
+import android.arch.persistence.room.Dao;
+import android.arch.persistence.room.Delete;
+import android.arch.persistence.room.Insert;
+import android.arch.persistence.room.Query;
 
 import java.util.List;
 
-import static com.android.support.room.OnConflictStrategy.IGNORE;
+import static android.arch.persistence.room.OnConflictStrategy.IGNORE;
 
 @Dao
 public interface UserDao {
@@ -54,7 +54,7 @@
     @Query("SELECT * FROM User WHERE :age == :age") // TODO: Fix this!
     List<User> findYoungerThan(int age);
 
-    @Query("SELECT * FROM User WHERE age < :age") // TODO: Fix this!
+    @Query("SELECT * FROM User WHERE age < :age")
     List<User> findYoungerThanSolution(int age);
 
     @Query("DELETE FROM User")
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step1/UsersActivity.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step1/UsersActivity.java
index 14bda80..3a7f118 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step1/UsersActivity.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step1/UsersActivity.java
@@ -19,7 +19,7 @@
 import android.os.Bundle;
 import android.widget.TextView;
 
-import com.android.support.lifecycle.LifecycleActivity;
+import android.arch.lifecycle.LifecycleActivity;
 import com.example.android.codelabs.persistence.R;
 import com.example.android.persistence.codelab.db.AppDatabase;
 import com.example.android.persistence.codelab.db.User;
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step1_solution/UsersActivity.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step1_solution/UsersActivity.java
index 2f882e3..1399f0e 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step1_solution/UsersActivity.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step1_solution/UsersActivity.java
@@ -19,7 +19,7 @@
 import android.os.Bundle;
 import android.widget.TextView;
 
-import com.android.support.lifecycle.LifecycleActivity;
+import android.arch.lifecycle.LifecycleActivity;
 import com.example.android.codelabs.persistence.R;
 import com.example.android.persistence.codelab.db.AppDatabase;
 import com.example.android.persistence.codelab.db.User;
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step2/JankShowUserActivity.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step2/JankShowUserActivity.java
index ccbeb05..7ff52cc 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step2/JankShowUserActivity.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step2/JankShowUserActivity.java
@@ -21,7 +21,7 @@
 import android.view.View;
 import android.widget.TextView;
 
-import com.android.support.lifecycle.LifecycleActivity;
+import android.arch.lifecycle.LifecycleActivity;
 import com.example.android.codelabs.persistence.R;
 import com.example.android.persistence.codelab.db.AppDatabase;
 import com.example.android.persistence.codelab.db.Book;
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step3/BooksBorrowedByUserActivity.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step3/BooksBorrowedByUserActivity.java
index 06b2e65..0e11268 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step3/BooksBorrowedByUserActivity.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step3/BooksBorrowedByUserActivity.java
@@ -21,8 +21,8 @@
 import android.view.View;
 import android.widget.TextView;
 
-import com.android.support.lifecycle.LifecycleActivity;
-import com.android.support.lifecycle.ViewModelProviders;
+import android.arch.lifecycle.LifecycleActivity;
+import android.arch.lifecycle.ViewModelProviders;
 import com.example.android.codelabs.persistence.R;
 import com.example.android.persistence.codelab.db.Book;
 
@@ -55,7 +55,7 @@
 
     private void subscribeUiBooks() {
         // TODO: refresh the list of books when there's new data
-        // mViewModel.getBooks().observe(...
+        // mViewModel.books.observe(...
     }
 
     @SuppressWarnings("unused")
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step3/BooksBorrowedByUserViewModel.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step3/BooksBorrowedByUserViewModel.java
index 3a86d65..badead3 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step3/BooksBorrowedByUserViewModel.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step3/BooksBorrowedByUserViewModel.java
@@ -18,8 +18,8 @@
 
 import android.app.Application;
 
-import com.android.support.lifecycle.AndroidViewModel;
-import com.android.support.lifecycle.LiveData;
+import android.arch.lifecycle.AndroidViewModel;
+import android.arch.lifecycle.LiveData;
 import com.example.android.persistence.codelab.db.AppDatabase;
 import com.example.android.persistence.codelab.db.Book;
 import com.example.android.persistence.codelab.db.utils.DatabaseInitializer;
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step3_solution/BooksBorrowedByUserActivity.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step3_solution/BooksBorrowedByUserActivity.java
index 078975a..d488333 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step3_solution/BooksBorrowedByUserActivity.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step3_solution/BooksBorrowedByUserActivity.java
@@ -21,9 +21,9 @@
 import android.view.View;
 import android.widget.TextView;
 
-import com.android.support.lifecycle.LifecycleActivity;
-import com.android.support.lifecycle.Observer;
-import com.android.support.lifecycle.ViewModelProviders;
+import android.arch.lifecycle.LifecycleActivity;
+import android.arch.lifecycle.Observer;
+import android.arch.lifecycle.ViewModelProviders;
 import com.example.android.codelabs.persistence.R;
 import com.example.android.persistence.codelab.db.Book;
 
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step3_solution/BooksBorrowedByUserViewModel.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step3_solution/BooksBorrowedByUserViewModel.java
index e8e0a9c..4599b68 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step3_solution/BooksBorrowedByUserViewModel.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step3_solution/BooksBorrowedByUserViewModel.java
@@ -18,8 +18,8 @@
 
 import android.app.Application;
 
-import com.android.support.lifecycle.AndroidViewModel;
-import com.android.support.lifecycle.LiveData;
+import android.arch.lifecycle.AndroidViewModel;
+import android.arch.lifecycle.LiveData;
 import com.example.android.persistence.codelab.db.AppDatabase;
 import com.example.android.persistence.codelab.db.Book;
 import com.example.android.persistence.codelab.db.utils.DatabaseInitializer;
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step4/TypeConvertersActivity.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step4/TypeConvertersActivity.java
index 14b5799..2af252b 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step4/TypeConvertersActivity.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step4/TypeConvertersActivity.java
@@ -21,9 +21,9 @@
 import android.view.View;
 import android.widget.TextView;
 
-import com.android.support.lifecycle.LifecycleActivity;
-import com.android.support.lifecycle.Observer;
-import com.android.support.lifecycle.ViewModelProviders;
+import android.arch.lifecycle.LifecycleActivity;
+import android.arch.lifecycle.Observer;
+import android.arch.lifecycle.ViewModelProviders;
 import com.example.android.codelabs.persistence.R;
 import com.example.android.persistence.codelab.db.Book;
 
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step4/TypeConvertersViewModel.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step4/TypeConvertersViewModel.java
index ef86f7c..08b7edf 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step4/TypeConvertersViewModel.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step4/TypeConvertersViewModel.java
@@ -18,8 +18,8 @@
 
 import android.app.Application;
 
-import com.android.support.lifecycle.AndroidViewModel;
-import com.android.support.lifecycle.LiveData;
+import android.arch.lifecycle.AndroidViewModel;
+import android.arch.lifecycle.LiveData;
 import com.example.android.persistence.codelab.db.AppDatabase;
 import com.example.android.persistence.codelab.db.Book;
 import com.example.android.persistence.codelab.db.utils.DatabaseInitializer;
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step4_solution/TypeConvertersActivity.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step4_solution/TypeConvertersActivity.java
index 8d2c60c..2d309ac 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step4_solution/TypeConvertersActivity.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step4_solution/TypeConvertersActivity.java
@@ -21,9 +21,9 @@
 import android.view.View;
 import android.widget.TextView;
 
-import com.android.support.lifecycle.LifecycleActivity;
-import com.android.support.lifecycle.Observer;
-import com.android.support.lifecycle.ViewModelProviders;
+import android.arch.lifecycle.LifecycleActivity;
+import android.arch.lifecycle.Observer;
+import android.arch.lifecycle.ViewModelProviders;
 import com.example.android.codelabs.persistence.R;
 import com.example.android.persistence.codelab.db.Book;
 
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step4_solution/TypeConvertersViewModel.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step4_solution/TypeConvertersViewModel.java
index 3f1eb83..5add97c 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step4_solution/TypeConvertersViewModel.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step4_solution/TypeConvertersViewModel.java
@@ -18,8 +18,8 @@
 
 import android.app.Application;
 
-import com.android.support.lifecycle.AndroidViewModel;
-import com.android.support.lifecycle.LiveData;
+import android.arch.lifecycle.AndroidViewModel;
+import android.arch.lifecycle.LiveData;
 import com.example.android.persistence.codelab.db.AppDatabase;
 import com.example.android.persistence.codelab.db.Book;
 import com.example.android.persistence.codelab.db.utils.DatabaseInitializer;
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step5/CustomResultActivity.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step5/CustomResultActivity.java
index e092752..2e07e97 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step5/CustomResultActivity.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step5/CustomResultActivity.java
@@ -21,9 +21,9 @@
 import android.view.View;
 import android.widget.TextView;
 
-import com.android.support.lifecycle.LifecycleActivity;
-import com.android.support.lifecycle.Observer;
-import com.android.support.lifecycle.ViewModelProviders;
+import android.arch.lifecycle.LifecycleActivity;
+import android.arch.lifecycle.Observer;
+import android.arch.lifecycle.ViewModelProviders;
 import com.example.android.codelabs.persistence.R;
 
 
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step5/CustomResultViewModel.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step5/CustomResultViewModel.java
index bb0a6fe3..157c4db 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step5/CustomResultViewModel.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step5/CustomResultViewModel.java
@@ -17,47 +17,28 @@
 package com.example.android.persistence.codelab.step5;
 
 import android.app.Application;
-import android.support.annotation.NonNull;
+import android.arch.core.util.Function;
+import android.arch.lifecycle.AndroidViewModel;
+import android.arch.lifecycle.LiveData;
+import android.arch.lifecycle.Transformations;
 
-import com.android.support.lifecycle.AndroidViewModel;
-import com.android.support.lifecycle.LiveData;
-import com.android.support.lifecycle.Observer;
 import com.example.android.persistence.codelab.db.AppDatabase;
 import com.example.android.persistence.codelab.db.LoanWithUserAndBook;
 import com.example.android.persistence.codelab.db.utils.DatabaseInitializer;
 
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
 
 public class CustomResultViewModel extends AndroidViewModel {
 
-    private LiveData<List<LoanWithUserAndBook>> mLoans;
-
     private LiveData<String> mLoansResult;
 
     private AppDatabase mDb;
 
-    private final Observer<List<LoanWithUserAndBook>> mObserver =
-            new Observer<List<LoanWithUserAndBook>>() {
-                @Override
-                public void onChanged(
-                        @NonNull final List<LoanWithUserAndBook> loansWithUserAndBook) {
-                    StringBuilder sb = new StringBuilder();
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm",
-                            Locale.US);
-
-                    for (LoanWithUserAndBook loan : loansWithUserAndBook) {
-                        sb.append(String.format("%s\n  (Returned: %s)\n",
-                                loan.bookTitle,
-                                simpleDateFormat.format(loan.endTime)));
-
-                    }
-                    mLoansResult.setValue(sb.toString());
-                }
-            };
-
     public CustomResultViewModel(Application application) {
         super(application);
     }
@@ -77,26 +58,33 @@
     }
 
     private void subscribeToDbChanges() {
-        // Books is a LiveData object so updates are observed.
-        removeObserver();
-
         // TODO: Modify this query to show only recent loans from specific user
-        mLoans = mDb.loanModel().findAllWithUserAndBook();
+        LiveData<List<LoanWithUserAndBook>> loans
+                = mDb.loanModel().findAllWithUserAndBook();
 
-        mLoansResult = new LiveData<>();
+        // Instead of exposing the list of Loans, we can apply a transformation and expose Strings.
+        mLoansResult = Transformations.map(loans,
+                new Function<List<LoanWithUserAndBook>, String>() {
+            @Override
+            public String apply(List<LoanWithUserAndBook> loansWithUserAndBook) {
+                StringBuilder sb = new StringBuilder();
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm",
+                        Locale.US);
 
-        mLoans.observeForever(mObserver);
+                for (LoanWithUserAndBook loan : loansWithUserAndBook) {
+                    sb.append(String.format("%s\n  (Returned: %s)\n",
+                            loan.bookTitle,
+                            simpleDateFormat.format(loan.endTime)));
+                }
+                return sb.toString();
+            }
+        });
     }
 
-    @Override
-    protected void onCleared() {
-        super.onCleared();
-        removeObserver();
-    }
-
-    private void removeObserver() {
-        if (mLoans != null) {
-            mLoans.removeObserver(mObserver);
-        }
+    @SuppressWarnings("unused")
+    private Date getYesterdayDate() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DATE, -1);
+        return calendar.getTime();
     }
 }
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step5_solution/CustomResultUserActivity.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step5_solution/CustomResultUserActivity.java
index b53d9bf..e17a809 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step5_solution/CustomResultUserActivity.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step5_solution/CustomResultUserActivity.java
@@ -21,9 +21,9 @@
 import android.view.View;
 import android.widget.TextView;
 
-import com.android.support.lifecycle.LifecycleActivity;
-import com.android.support.lifecycle.Observer;
-import com.android.support.lifecycle.ViewModelProviders;
+import android.arch.lifecycle.LifecycleActivity;
+import android.arch.lifecycle.Observer;
+import android.arch.lifecycle.ViewModelProviders;
 import com.example.android.codelabs.persistence.R;
 
 
diff --git a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step5_solution/CustomResultViewModel.java b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step5_solution/CustomResultViewModel.java
index dcdb051..f6f4c20 100644
--- a/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step5_solution/CustomResultViewModel.java
+++ b/samples-flatfoot/codelabs/persistence/app/src/main/java/com/example/android/persistence/codelab/step5_solution/CustomResultViewModel.java
@@ -17,11 +17,11 @@
 package com.example.android.persistence.codelab.step5_solution;
 
 import android.app.Application;
-import android.support.annotation.NonNull;
+import android.arch.core.util.Function;
+import android.arch.lifecycle.AndroidViewModel;
+import android.arch.lifecycle.LiveData;
+import android.arch.lifecycle.Transformations;
 
-import com.android.support.lifecycle.AndroidViewModel;
-import com.android.support.lifecycle.LiveData;
-import com.android.support.lifecycle.Observer;
 import com.example.android.persistence.codelab.db.AppDatabase;
 import com.example.android.persistence.codelab.db.LoanWithUserAndBook;
 import com.example.android.persistence.codelab.db.utils.DatabaseInitializer;
@@ -35,31 +35,10 @@
 
 public class CustomResultViewModel extends AndroidViewModel {
 
-    private LiveData<List<LoanWithUserAndBook>> mLoans;
-
     private LiveData<String> mLoansResult;
 
     private AppDatabase mDb;
 
-    private final Observer<List<LoanWithUserAndBook>> mObserver =
-            new Observer<List<LoanWithUserAndBook>>() {
-                @Override
-                public void onChanged(
-                        @NonNull final List<LoanWithUserAndBook> loansWithUserAndBook) {
-                    StringBuilder sb = new StringBuilder();
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm",
-                            Locale.US);
-
-                    for (LoanWithUserAndBook loan : loansWithUserAndBook) {
-                        sb.append(String.format("%s\n  (Returned: %s)\n",
-                                loan.bookTitle,
-                                simpleDateFormat.format(loan.endTime)));
-
-                    }
-                    mLoansResult.setValue(sb.toString());
-                }
-            };
-
     public CustomResultViewModel(Application application) {
         super(application);
     }
@@ -79,28 +58,31 @@
     }
 
     private void subscribeToDbChanges() {
-        // Books is a LiveData object so updates are observed.
+        LiveData<List<LoanWithUserAndBook>> loans
+                = mDb.loanModel().findLoansByNameAfter("Mike", getYesterdayDate());
 
+        // Instead of exposing the list of Loans, we can apply a transformation and expose Strings.
+        mLoansResult = Transformations.map(loans,
+                new Function<List<LoanWithUserAndBook>, String>() {
+            @Override
+            public String apply(List<LoanWithUserAndBook> loansWithUserAndBook) {
+                StringBuilder sb = new StringBuilder();
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm",
+                        Locale.US);
+
+                for (LoanWithUserAndBook loan : loansWithUserAndBook) {
+                    sb.append(String.format("%s\n  (Returned: %s)\n",
+                            loan.bookTitle,
+                            simpleDateFormat.format(loan.endTime)));
+                }
+                return sb.toString();
+            }
+        });
+    }
+
+    private Date getYesterdayDate() {
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.DATE, -1);
-        Date yesterday = calendar.getTime();
-        removeObserver();
-        mLoans = mDb.loanModel().findLoansByNameAfter("Mike", yesterday);
-
-        mLoansResult = new LiveData<>();
-
-        mLoans.observeForever(mObserver);
-    }
-
-    @Override
-    protected void onCleared() {
-        super.onCleared();
-        removeObserver();
-    }
-
-    private void removeObserver() {
-        if (mLoans != null) {
-            mLoans.removeObserver(mObserver);
-        }
+        return calendar.getTime();
     }
 }
diff --git a/samples-flatfoot/codelabs/persistence/build.gradle b/samples-flatfoot/codelabs/persistence/build.gradle
index d91dde3..2d9ee91 100644
--- a/samples-flatfoot/codelabs/persistence/build.gradle
+++ b/samples-flatfoot/codelabs/persistence/build.gradle
@@ -32,7 +32,7 @@
     repositories {
         jcenter()
         maven {
-            url "../../prebuilts"
+            url "../../prebuilts2604"
         }
     }
 }
@@ -40,3 +40,13 @@
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+ext {
+    buildToolsVersion = "25.0.2"
+    supportLibVersion = "25.3.1"
+    runnerVersion = "0.5"
+    rulesVersion = "0.5"
+    espressoVersion = "2.2.2"
+    archLifecycleVersion = "1.0-SNAPSHOT"
+    archRoomVersion = "1.0-SNAPSHOT"
+}
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT-sources.jar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT-sources.jar
new file mode 100644
index 0000000..2cbc35c
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT-sources.jar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT-sources.jar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT-sources.jar.md5
new file mode 100644
index 0000000..327609a
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT-sources.jar.md5
@@ -0,0 +1 @@
+c00cf2a03781c7cd9cb7818748ca4f91
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT-sources.jar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT-sources.jar.sha1
new file mode 100644
index 0000000..ed7be9f
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT-sources.jar.sha1
@@ -0,0 +1 @@
+bebe116a461e2e7dc4de6c7afc633a906609067d
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT.aar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT.aar
new file mode 100644
index 0000000..7f82835
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT.aar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT.aar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT.aar.md5
new file mode 100644
index 0000000..e7fd860
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT.aar.md5
@@ -0,0 +1 @@
+da5fdda184cd3603db506e3e2ca8222d
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT.aar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT.aar.sha1
new file mode 100644
index 0000000..c2f741e
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT.aar.sha1
@@ -0,0 +1 @@
+7bbb30b5160073315cba5234f4607947dfba88b1
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT.pom b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT.pom
new file mode 100644
index 0000000..0e49945
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT.pom
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>android.arch.core</groupId>
+  <artifactId>core-testing</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>aar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>android.arch.core</groupId>
+      <artifactId>core</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>support-annotations</artifactId>
+      <version>25.2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>support-core-utils</artifactId>
+      <version>25.2.0</version>
+      <type>aar</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>hamcrest-core</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT.pom.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT.pom.md5
new file mode 100644
index 0000000..6b5ba5c
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT.pom.md5
@@ -0,0 +1 @@
+0d778e771a42534c922287dcfb20e795
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT.pom.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT.pom.sha1
new file mode 100644
index 0000000..c0ef314
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/1.0-SNAPSHOT/core-testing-1.0-SNAPSHOT.pom.sha1
@@ -0,0 +1 @@
+d7454e2284984a2dd6fa571b1c4e49425ab99cad
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/maven-metadata.xml b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/maven-metadata.xml
new file mode 100644
index 0000000..9a56d91
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/maven-metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>android.arch.core</groupId>
+  <artifactId>core-testing</artifactId>
+  <versioning>
+    <versions>
+      <version>1.0-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20170425234931</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/maven-metadata.xml.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/maven-metadata.xml.md5
new file mode 100644
index 0000000..9f0be68
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/maven-metadata.xml.md5
@@ -0,0 +1 @@
+79865ce025f0d9e2424cdfaa1ce9b9e2
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/maven-metadata.xml.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/maven-metadata.xml.sha1
new file mode 100644
index 0000000..46a3d8b
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core-testing/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+44027191e93cb6d9d292497e7b4824eb1ff9e1ee
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT-sources.jar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT-sources.jar
new file mode 100644
index 0000000..5abfeab
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT-sources.jar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT-sources.jar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT-sources.jar.md5
new file mode 100644
index 0000000..ec4cca9
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT-sources.jar.md5
@@ -0,0 +1 @@
+f040f8c96ca484e664fd13d34d3b2dcc
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT-sources.jar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT-sources.jar.sha1
new file mode 100644
index 0000000..fe0a569
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT-sources.jar.sha1
@@ -0,0 +1 @@
+7b184e5080ca42d6610c14edaa136fc08b76b92e
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT.aar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT.aar
new file mode 100644
index 0000000..1a0ed5d
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT.aar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT.aar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT.aar.md5
new file mode 100644
index 0000000..626a023
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT.aar.md5
@@ -0,0 +1 @@
+59ec2601337d911a8c0fbddf8075215f
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT.aar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT.aar.sha1
new file mode 100644
index 0000000..55c89b1
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT.aar.sha1
@@ -0,0 +1 @@
+c140932d6aa4b69a903df4aa9ba1bdaa1bfbcfd1
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT.pom b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT.pom
new file mode 100644
index 0000000..37a1e12
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT.pom
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>android.arch.core</groupId>
+  <artifactId>core</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>aar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>support-annotations</artifactId>
+      <version>25.2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>support-core-utils</artifactId>
+      <version>25.2.0</version>
+      <type>aar</type>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT.pom.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT.pom.md5
new file mode 100644
index 0000000..244a845
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT.pom.md5
@@ -0,0 +1 @@
+dbb2b7bf2ffdd8741bdb981dfc05761a
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT.pom.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT.pom.sha1
new file mode 100644
index 0000000..be0e04b
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/1.0-SNAPSHOT/core-1.0-SNAPSHOT.pom.sha1
@@ -0,0 +1 @@
+3cd32ebf05ebf39f8568a833139b31728eda86de
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/maven-metadata.xml b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/maven-metadata.xml
new file mode 100644
index 0000000..fa3e15b
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/maven-metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>android.arch.core</groupId>
+  <artifactId>core</artifactId>
+  <versioning>
+    <versions>
+      <version>1.0-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20170425234930</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/maven-metadata.xml.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/maven-metadata.xml.md5
new file mode 100644
index 0000000..ba0d578
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/maven-metadata.xml.md5
@@ -0,0 +1 @@
+f3cbb503d461efe341bf91f2bb4dbf0d
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/maven-metadata.xml.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/maven-metadata.xml.sha1
new file mode 100644
index 0000000..f27d172
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/core/core/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+590d66afba5550d32c82492ea15466c1f3cc0f71
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT-sources.jar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT-sources.jar
new file mode 100644
index 0000000..24cc611
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT-sources.jar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT-sources.jar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT-sources.jar.md5
new file mode 100644
index 0000000..8ee897f
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT-sources.jar.md5
@@ -0,0 +1 @@
+e2718134c8a2f1974cc8fa21b9c36e6d
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT-sources.jar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT-sources.jar.sha1
new file mode 100644
index 0000000..fefbf46
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT-sources.jar.sha1
@@ -0,0 +1 @@
+5aa3247dfc2d2b67cb4e7ff55dced23c764dd9db
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.jar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.jar
new file mode 100644
index 0000000..e805c3f
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.jar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.jar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.jar.md5
new file mode 100644
index 0000000..342f81f5
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.jar.md5
@@ -0,0 +1 @@
+47da9983ee66234b3b050df0d85f24ed
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.jar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.jar.sha1
new file mode 100644
index 0000000..6ad5878
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.jar.sha1
@@ -0,0 +1 @@
+5087600d676282a32c80c8b31c71274efa2ce743
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.pom b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.pom
new file mode 100644
index 0000000..2a2c6a2
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.pom
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>android.arch.lifecycle</groupId>
+  <artifactId>common</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <dependencies>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>support-annotations</artifactId>
+      <version>25.2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.pom.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.pom.md5
new file mode 100644
index 0000000..f587d0d
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.pom.md5
@@ -0,0 +1 @@
+a3d47b73dc2c60f4e284edccaa32a2c6
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.pom.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.pom.sha1
new file mode 100644
index 0000000..4b27254
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.pom.sha1
@@ -0,0 +1 @@
+08b48078fcd3405b228d765b3f5330657177dcf9
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/maven-metadata.xml b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/maven-metadata.xml
new file mode 100644
index 0000000..0d44381
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/maven-metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>android.arch.lifecycle</groupId>
+  <artifactId>common</artifactId>
+  <versioning>
+    <versions>
+      <version>1.0-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20170425234930</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/maven-metadata.xml.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/maven-metadata.xml.md5
new file mode 100644
index 0000000..f720179
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/maven-metadata.xml.md5
@@ -0,0 +1 @@
+67cfe7b8699756229163b6c7e7bbefef
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/maven-metadata.xml.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/maven-metadata.xml.sha1
new file mode 100644
index 0000000..d08e436
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/common/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+149f27c6348d2275a14f0c2379a969a72d5d2f40
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.jar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.jar
new file mode 100644
index 0000000..dec0474
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.jar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.jar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.jar.md5
new file mode 100644
index 0000000..ed7486b
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.jar.md5
@@ -0,0 +1 @@
+06f7fb4ad923883aa7e1be2836415cc7
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.jar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.jar.sha1
new file mode 100644
index 0000000..0213212
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.jar.sha1
@@ -0,0 +1 @@
+c06e8da6648672c6fd0b082c7e0702257e3467f6
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.pom b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.pom
new file mode 100644
index 0000000..f535b27
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.pom
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>android.arch.lifecycle</groupId>
+  <artifactId>compiler</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <dependencies>
+    <dependency>
+      <groupId>android.arch.lifecycle</groupId>
+      <artifactId>common</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib</artifactId>
+      <version>1.1.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.auto</groupId>
+      <artifactId>auto-common</artifactId>
+      <version>0.6</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup</groupId>
+      <artifactId>javapoet</artifactId>
+      <version>1.8.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.testing.compile</groupId>
+      <artifactId>compile-testing</artifactId>
+      <version>0.9</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.pom.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.pom.md5
new file mode 100644
index 0000000..6133381
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.pom.md5
@@ -0,0 +1 @@
+11e01c4576a32a85e2217ace258bb3ae
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.pom.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.pom.sha1
new file mode 100644
index 0000000..7f95c9e0
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.pom.sha1
@@ -0,0 +1 @@
+0b05cdc5ef9399c719781af8eca2181e26c497eb
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/maven-metadata.xml b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/maven-metadata.xml
new file mode 100644
index 0000000..2ddb712
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/maven-metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>android.arch.lifecycle</groupId>
+  <artifactId>compiler</artifactId>
+  <versioning>
+    <versions>
+      <version>1.0-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20170425234942</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/maven-metadata.xml.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/maven-metadata.xml.md5
new file mode 100644
index 0000000..8ce2d4d
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/maven-metadata.xml.md5
@@ -0,0 +1 @@
+6323ebd7d89265938d13a79f379409bd
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/maven-metadata.xml.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/maven-metadata.xml.sha1
new file mode 100644
index 0000000..7384c1e
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/compiler/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+7fc2dd17b24eb875b26f7c77f553ae98f63e5748
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT-sources.jar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT-sources.jar
new file mode 100644
index 0000000..c8464e5
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT-sources.jar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT-sources.jar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT-sources.jar.md5
new file mode 100644
index 0000000..fad3eca
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT-sources.jar.md5
@@ -0,0 +1 @@
+f185657fa7612def55131997dd5df2b1
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT-sources.jar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT-sources.jar.sha1
new file mode 100644
index 0000000..7bb82ab
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT-sources.jar.sha1
@@ -0,0 +1 @@
+f5885c40c4ce637de83ffc10812c44f318ae84e6
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT.aar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT.aar
new file mode 100644
index 0000000..68310a8
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT.aar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT.aar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT.aar.md5
new file mode 100644
index 0000000..bfd4e8f
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT.aar.md5
@@ -0,0 +1 @@
+4a0df25159cce8b1efa510ea3d16cd60
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT.aar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT.aar.sha1
new file mode 100644
index 0000000..1e5adbf
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT.aar.sha1
@@ -0,0 +1 @@
+6e625c008168915de04ac27b7c8ecdd01c3a30e7
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT.pom b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT.pom
new file mode 100644
index 0000000..8c8c5be
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT.pom
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>android.arch.lifecycle</groupId>
+  <artifactId>extensions</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>aar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>android.arch.lifecycle</groupId>
+      <artifactId>common</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>android.arch.lifecycle</groupId>
+      <artifactId>runtime</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>android.arch.core</groupId>
+      <artifactId>core</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>support-fragment</artifactId>
+      <version>25.2.0</version>
+      <type>aar</type>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT.pom.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT.pom.md5
new file mode 100644
index 0000000..46dd854
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT.pom.md5
@@ -0,0 +1 @@
+1bc657169a7072763ceabdaca9f5c1f6
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT.pom.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT.pom.sha1
new file mode 100644
index 0000000..d396ef7
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/1.0-SNAPSHOT/extensions-1.0-SNAPSHOT.pom.sha1
@@ -0,0 +1 @@
+5ea420789ede885703eda487650b3b1ec1335590
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/maven-metadata.xml b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/maven-metadata.xml
new file mode 100644
index 0000000..26cd6fa
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/maven-metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>android.arch.lifecycle</groupId>
+  <artifactId>extensions</artifactId>
+  <versioning>
+    <versions>
+      <version>1.0-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20170425234932</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/maven-metadata.xml.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/maven-metadata.xml.md5
new file mode 100644
index 0000000..5a323e5
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/maven-metadata.xml.md5
@@ -0,0 +1 @@
+0780bdd5c07d2573d1e6b19d151686f7
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/maven-metadata.xml.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/maven-metadata.xml.sha1
new file mode 100644
index 0000000..8e0334c
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/extensions/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+d91cd0c4f8c61264e25dce3a73e06089015ad60e
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT-sources.jar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT-sources.jar
new file mode 100644
index 0000000..818e10b
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT-sources.jar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT-sources.jar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT-sources.jar.md5
new file mode 100644
index 0000000..4d3b9cc
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT-sources.jar.md5
@@ -0,0 +1 @@
+a602b2493ae61c8ef2632aa4f521ebfc
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT-sources.jar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT-sources.jar.sha1
new file mode 100644
index 0000000..c0e78bf
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT-sources.jar.sha1
@@ -0,0 +1 @@
+546037c65cedca0b8be93c961dfdcc16c0f34e91
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT.aar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT.aar
new file mode 100644
index 0000000..54bd1693
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT.aar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT.aar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT.aar.md5
new file mode 100644
index 0000000..1099fbb
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT.aar.md5
@@ -0,0 +1 @@
+8587e93642c0f649a52a2b1ec0804bd1
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT.aar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT.aar.sha1
new file mode 100644
index 0000000..d847a90
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT.aar.sha1
@@ -0,0 +1 @@
+5cd377d7c40a7fd45174d4bb590f636e9fd899f4
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT.pom b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT.pom
new file mode 100644
index 0000000..1acf4de
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT.pom
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>android.arch.lifecycle</groupId>
+  <artifactId>reactivestreams</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>aar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>android.arch.core</groupId>
+      <artifactId>core</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>android.arch.lifecycle</groupId>
+      <artifactId>common</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>android.arch.lifecycle</groupId>
+      <artifactId>extensions</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>android.arch.lifecycle</groupId>
+      <artifactId>runtime</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>support-annotations</artifactId>
+      <version>25.2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.reactivestreams</groupId>
+      <artifactId>reactive-streams</artifactId>
+      <version>1.0.0</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT.pom.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT.pom.md5
new file mode 100644
index 0000000..281c0ec
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT.pom.md5
@@ -0,0 +1 @@
+d100fe77c4b95264134281078880bf7c
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT.pom.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT.pom.sha1
new file mode 100644
index 0000000..83d8797
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/1.0-SNAPSHOT/reactivestreams-1.0-SNAPSHOT.pom.sha1
@@ -0,0 +1 @@
+0b1f6442bb8375850efc983bef2352cb17fbfb49
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/maven-metadata.xml b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/maven-metadata.xml
new file mode 100644
index 0000000..07446e7
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/maven-metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>android.arch.lifecycle</groupId>
+  <artifactId>reactivestreams</artifactId>
+  <versioning>
+    <versions>
+      <version>1.0-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20170425234933</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/maven-metadata.xml.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/maven-metadata.xml.md5
new file mode 100644
index 0000000..a72d4e4
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/maven-metadata.xml.md5
@@ -0,0 +1 @@
+55a50ed2c6cf024378a9ac8fbc7f60af
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/maven-metadata.xml.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/maven-metadata.xml.sha1
new file mode 100644
index 0000000..246406e
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/reactivestreams/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+0a01e2638b43116f8febfdd818b8412a55ad205e
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT-sources.jar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT-sources.jar
new file mode 100644
index 0000000..1853548
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT-sources.jar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT-sources.jar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT-sources.jar.md5
new file mode 100644
index 0000000..c52eefa
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT-sources.jar.md5
@@ -0,0 +1 @@
+64f2e5fd96b662a8688d2a7c8a38fe23
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT-sources.jar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT-sources.jar.sha1
new file mode 100644
index 0000000..aa4e67c
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT-sources.jar.sha1
@@ -0,0 +1 @@
+bdc1e3610b6a96bf3cce3e332fbbdb355086f79c
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.aar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.aar
new file mode 100644
index 0000000..77c6161
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.aar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.aar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.aar.md5
new file mode 100644
index 0000000..83aa519
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.aar.md5
@@ -0,0 +1 @@
+b299ddee49576a4e15e583b9a8cd056c
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.aar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.aar.sha1
new file mode 100644
index 0000000..ec77d2e
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.aar.sha1
@@ -0,0 +1 @@
+5052b51ae84c34e30fbffa50f2649ff18aa330e5
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.pom b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.pom
new file mode 100644
index 0000000..fc3a559
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.pom
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>android.arch.lifecycle</groupId>
+  <artifactId>runtime</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>aar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>android.arch.lifecycle</groupId>
+      <artifactId>common</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>android.arch.core</groupId>
+      <artifactId>core</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>support-core-utils</artifactId>
+      <version>25.2.0</version>
+      <type>aar</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>support-fragment</artifactId>
+      <version>25.2.0</version>
+      <type>aar</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>support-annotations</artifactId>
+      <version>25.2.0</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.pom.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.pom.md5
new file mode 100644
index 0000000..5339607
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.pom.md5
@@ -0,0 +1 @@
+dedd00bf10be9345fb58e6c341d5b83b
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.pom.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.pom.sha1
new file mode 100644
index 0000000..4203dba
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.pom.sha1
@@ -0,0 +1 @@
+62748c6bc4e98e26508b968086172a7f175d101d
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/maven-metadata.xml b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/maven-metadata.xml
new file mode 100644
index 0000000..07c583b
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/maven-metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>android.arch.lifecycle</groupId>
+  <artifactId>runtime</artifactId>
+  <versioning>
+    <versions>
+      <version>1.0-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20170425234931</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/maven-metadata.xml.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/maven-metadata.xml.md5
new file mode 100644
index 0000000..fea9558
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/maven-metadata.xml.md5
@@ -0,0 +1 @@
+4a38d5cfd183257b24e9856373d2b323
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/maven-metadata.xml.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/maven-metadata.xml.sha1
new file mode 100644
index 0000000..8311e93
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/lifecycle/runtime/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+e191bb24259052bacadf35835060389f3d76449a
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT-sources.jar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT-sources.jar
new file mode 100644
index 0000000..57d5682
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT-sources.jar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT-sources.jar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT-sources.jar.md5
new file mode 100644
index 0000000..a8b5453
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT-sources.jar.md5
@@ -0,0 +1 @@
+bc7c526bd7c6bdb161cb90675e4751f1
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT-sources.jar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT-sources.jar.sha1
new file mode 100644
index 0000000..20c86d0
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT-sources.jar.sha1
@@ -0,0 +1 @@
+c644c7d9faf6c3cab0f32adb808fcfc88b25feb2
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.jar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.jar
new file mode 100644
index 0000000..82289a3
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.jar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.jar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.jar.md5
new file mode 100644
index 0000000..e26e9ae
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.jar.md5
@@ -0,0 +1 @@
+7e94f048c36e481659785208eada8b18
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.jar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.jar.sha1
new file mode 100644
index 0000000..1f21dfa
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.jar.sha1
@@ -0,0 +1 @@
+f75bb646363965ab81bbf92b4fc2bbc2ccc76b0a
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.pom b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.pom
new file mode 100644
index 0000000..9e1e0a7
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.pom
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>android.arch.persistence.room</groupId>
+  <artifactId>common</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <dependencies>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>support-annotations</artifactId>
+      <version>25.2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.pom.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.pom.md5
new file mode 100644
index 0000000..337b77b
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.pom.md5
@@ -0,0 +1 @@
+d2d34afe4df97e3cc011ea5767004ab1
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.pom.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.pom.sha1
new file mode 100644
index 0000000..7aed843
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/1.0-SNAPSHOT/common-1.0-SNAPSHOT.pom.sha1
@@ -0,0 +1 @@
+cfb361baaef3ea8286b0b20785d6e1fac68abf38
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/maven-metadata.xml b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/maven-metadata.xml
new file mode 100644
index 0000000..e0db869
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/maven-metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>android.arch.persistence.room</groupId>
+  <artifactId>common</artifactId>
+  <versioning>
+    <versions>
+      <version>1.0-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20170425234930</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/maven-metadata.xml.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/maven-metadata.xml.md5
new file mode 100644
index 0000000..264716c
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/maven-metadata.xml.md5
@@ -0,0 +1 @@
+c31bc14391576416ee43e17bb91d3415
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/maven-metadata.xml.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/maven-metadata.xml.sha1
new file mode 100644
index 0000000..ffde120
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/common/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+51e7aa0b3753d73e70f65dd17bb84f38ab3d798f
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.jar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.jar
new file mode 100644
index 0000000..8277f7b
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.jar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.jar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.jar.md5
new file mode 100644
index 0000000..80c20e7
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.jar.md5
@@ -0,0 +1 @@
+bb2dac27e28ac743ab3a7a83a376b29b
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.jar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.jar.sha1
new file mode 100644
index 0000000..7b9cab1
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.jar.sha1
@@ -0,0 +1 @@
+ef3fea16dbae22a9b5b9e9964c61ba870a511fcf
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.pom b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.pom
new file mode 100644
index 0000000..efe6593
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.pom
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>android.arch.persistence.room</groupId>
+  <artifactId>compiler</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <dependencies>
+    <dependency>
+      <groupId>android.arch.persistence.room</groupId>
+      <artifactId>common</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>android.arch.persistence.room</groupId>
+      <artifactId>migration</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib</artifactId>
+      <version>1.1.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.auto</groupId>
+      <artifactId>auto-common</artifactId>
+      <version>0.6</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup</groupId>
+      <artifactId>javapoet</artifactId>
+      <version>1.8.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.antlr</groupId>
+      <artifactId>antlr4</artifactId>
+      <version>4.5.3</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.xerial</groupId>
+      <artifactId>sqlite-jdbc</artifactId>
+      <version>3.16.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.testing.compile</groupId>
+      <artifactId>compile-testing</artifactId>
+      <version>0.9</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.intellij</groupId>
+      <artifactId>annotations</artifactId>
+      <version>12.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.pom.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.pom.md5
new file mode 100644
index 0000000..488d62c
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.pom.md5
@@ -0,0 +1 @@
+48fb3ae050b678360a30cb666cf9a1c6
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.pom.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.pom.sha1
new file mode 100644
index 0000000..75933e7c
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/1.0-SNAPSHOT/compiler-1.0-SNAPSHOT.pom.sha1
@@ -0,0 +1 @@
+e4542a5347e599d1d47698c0d22b9896b143aea1
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/maven-metadata.xml b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/maven-metadata.xml
new file mode 100644
index 0000000..80495a5
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/maven-metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>android.arch.persistence.room</groupId>
+  <artifactId>compiler</artifactId>
+  <versioning>
+    <versions>
+      <version>1.0-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20170425235004</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/maven-metadata.xml.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/maven-metadata.xml.md5
new file mode 100644
index 0000000..0e46c60
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/maven-metadata.xml.md5
@@ -0,0 +1 @@
+3808716689f464c5b4cf945405e09e10
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/maven-metadata.xml.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/maven-metadata.xml.sha1
new file mode 100644
index 0000000..84f26e1
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/compiler/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+5b87de15eb4f70e3703f2f82cc2a3374d5f8c835
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/1.0-SNAPSHOT/migration-1.0-SNAPSHOT.jar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/1.0-SNAPSHOT/migration-1.0-SNAPSHOT.jar
new file mode 100644
index 0000000..4c9e3a9
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/1.0-SNAPSHOT/migration-1.0-SNAPSHOT.jar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/1.0-SNAPSHOT/migration-1.0-SNAPSHOT.jar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/1.0-SNAPSHOT/migration-1.0-SNAPSHOT.jar.md5
new file mode 100644
index 0000000..e720755
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/1.0-SNAPSHOT/migration-1.0-SNAPSHOT.jar.md5
@@ -0,0 +1 @@
+21c63e2d61b9bd472236ab68e545365b
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/1.0-SNAPSHOT/migration-1.0-SNAPSHOT.jar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/1.0-SNAPSHOT/migration-1.0-SNAPSHOT.jar.sha1
new file mode 100644
index 0000000..412c061
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/1.0-SNAPSHOT/migration-1.0-SNAPSHOT.jar.sha1
@@ -0,0 +1 @@
+46fe42a341b8a980a9cef1df945918f4edbd0f7f
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/1.0-SNAPSHOT/migration-1.0-SNAPSHOT.pom b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/1.0-SNAPSHOT/migration-1.0-SNAPSHOT.pom
new file mode 100644
index 0000000..9d8a6fa
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/1.0-SNAPSHOT/migration-1.0-SNAPSHOT.pom
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>android.arch.persistence.room</groupId>
+  <artifactId>migration</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <dependencies>
+    <dependency>
+      <groupId>android.arch.persistence.room</groupId>
+      <artifactId>common</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib</artifactId>
+      <version>1.1.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.8.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.intellij</groupId>
+      <artifactId>annotations</artifactId>
+      <version>12.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/1.0-SNAPSHOT/migration-1.0-SNAPSHOT.pom.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/1.0-SNAPSHOT/migration-1.0-SNAPSHOT.pom.md5
new file mode 100644
index 0000000..33a93b0
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/1.0-SNAPSHOT/migration-1.0-SNAPSHOT.pom.md5
@@ -0,0 +1 @@
+0a669e52701c46ecadc30de6c051a639
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/1.0-SNAPSHOT/migration-1.0-SNAPSHOT.pom.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/1.0-SNAPSHOT/migration-1.0-SNAPSHOT.pom.sha1
new file mode 100644
index 0000000..0a70f31
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/1.0-SNAPSHOT/migration-1.0-SNAPSHOT.pom.sha1
@@ -0,0 +1 @@
+a63a70d662d9323509cb6a572a796758fe9db461
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/maven-metadata.xml b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/maven-metadata.xml
new file mode 100644
index 0000000..f2322ed
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/maven-metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>android.arch.persistence.room</groupId>
+  <artifactId>migration</artifactId>
+  <versioning>
+    <versions>
+      <version>1.0-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20170425234930</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/maven-metadata.xml.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/maven-metadata.xml.md5
new file mode 100644
index 0000000..009f56d
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/maven-metadata.xml.md5
@@ -0,0 +1 @@
+8d6a80d1cd3444c9143177f82e951b54
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/maven-metadata.xml.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/maven-metadata.xml.sha1
new file mode 100644
index 0000000..69f9087
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/migration/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+9c62c60791a294542bddbc643e3a10b97cd672cd
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT-sources.jar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT-sources.jar
new file mode 100644
index 0000000..a34da58
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT-sources.jar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT-sources.jar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT-sources.jar.md5
new file mode 100644
index 0000000..52e745f
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT-sources.jar.md5
@@ -0,0 +1 @@
+6f7a96d050f0295fec64baa55c1aabe2
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT-sources.jar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT-sources.jar.sha1
new file mode 100644
index 0000000..8e031c2
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT-sources.jar.sha1
@@ -0,0 +1 @@
+cb51f33a891c553da44e74362d412dd6d9096046
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.aar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.aar
new file mode 100644
index 0000000..4a1a73b
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.aar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.aar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.aar.md5
new file mode 100644
index 0000000..b01fc59
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.aar.md5
@@ -0,0 +1 @@
+1ea4750fbc0e1900f2e741ecb77d1763
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.aar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.aar.sha1
new file mode 100644
index 0000000..21e94e7
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.aar.sha1
@@ -0,0 +1 @@
+b753d27a04e35a9cb60b33bf952bcd3eb4e138d2
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.pom b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.pom
new file mode 100644
index 0000000..707842e
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.pom
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>android.arch.persistence.room</groupId>
+  <artifactId>runtime</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>aar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>android.arch.persistence.room</groupId>
+      <artifactId>common</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>android.arch.persistence.room</groupId>
+      <artifactId>support-db</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>android.arch.persistence.room</groupId>
+      <artifactId>support-db-impl</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>android.arch.core</groupId>
+      <artifactId>core</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>support-core-utils</artifactId>
+      <version>25.2.0</version>
+      <type>aar</type>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.pom.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.pom.md5
new file mode 100644
index 0000000..463c408
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.pom.md5
@@ -0,0 +1 @@
+d0fc4993bf94e590aa99857220576c76
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.pom.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.pom.sha1
new file mode 100644
index 0000000..f4c01bc
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/1.0-SNAPSHOT/runtime-1.0-SNAPSHOT.pom.sha1
@@ -0,0 +1 @@
+8cb8ce6c81bef5c29408adaf7fba330d72441e65
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/maven-metadata.xml b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/maven-metadata.xml
new file mode 100644
index 0000000..9ae1802
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/maven-metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>android.arch.persistence.room</groupId>
+  <artifactId>runtime</artifactId>
+  <versioning>
+    <versions>
+      <version>1.0-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20170425234932</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/maven-metadata.xml.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/maven-metadata.xml.md5
new file mode 100644
index 0000000..3dbae1f
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/maven-metadata.xml.md5
@@ -0,0 +1 @@
+db50bf82eab2277762d676c8f1bbf984
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/maven-metadata.xml.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/maven-metadata.xml.sha1
new file mode 100644
index 0000000..6de2b18
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/runtime/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+314d9b16d56c95408110c37909088b0005f16fcb
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT-sources.jar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT-sources.jar
new file mode 100644
index 0000000..1da4fed
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT-sources.jar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT-sources.jar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT-sources.jar.md5
new file mode 100644
index 0000000..4961129
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT-sources.jar.md5
@@ -0,0 +1 @@
+5321e31170dc29c9d818ddbc89baaf26
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT-sources.jar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT-sources.jar.sha1
new file mode 100644
index 0000000..24ce062
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT-sources.jar.sha1
@@ -0,0 +1 @@
+ca2ebc89527229d38eb4c2e2ef5a3cd33a24f66b
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT.aar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT.aar
new file mode 100644
index 0000000..33c30e8
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT.aar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT.aar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT.aar.md5
new file mode 100644
index 0000000..38c19859
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT.aar.md5
@@ -0,0 +1 @@
+18ae753161afd6894d3cd25710509e6e
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT.aar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT.aar.sha1
new file mode 100644
index 0000000..0be9c76
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT.aar.sha1
@@ -0,0 +1 @@
+cb4d7414e0e70443e44499766de7816b96f5661b
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT.pom b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT.pom
new file mode 100644
index 0000000..c79ace2
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT.pom
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>android.arch.persistence.room</groupId>
+  <artifactId>rxjava2</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>aar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>android.arch.persistence.room</groupId>
+      <artifactId>common</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>android.arch.persistence.room</groupId>
+      <artifactId>runtime</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>android.arch.core</groupId>
+      <artifactId>core</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>support-core-utils</artifactId>
+      <version>25.2.0</version>
+      <type>aar</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.reactivex.rxjava2</groupId>
+      <artifactId>rxjava</artifactId>
+      <version>2.0.6</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT.pom.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT.pom.md5
new file mode 100644
index 0000000..4788092
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT.pom.md5
@@ -0,0 +1 @@
+a31caad4451123ddfdc614f15851450c
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT.pom.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT.pom.sha1
new file mode 100644
index 0000000..9a3787a
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/1.0-SNAPSHOT/rxjava2-1.0-SNAPSHOT.pom.sha1
@@ -0,0 +1 @@
+942851bad51499d6605c8b2c6dc2d9a1bb3d033a
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/maven-metadata.xml b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/maven-metadata.xml
new file mode 100644
index 0000000..f630bb7
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/maven-metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>android.arch.persistence.room</groupId>
+  <artifactId>rxjava2</artifactId>
+  <versioning>
+    <versions>
+      <version>1.0-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20170425234933</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/maven-metadata.xml.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/maven-metadata.xml.md5
new file mode 100644
index 0000000..999a45c
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/maven-metadata.xml.md5
@@ -0,0 +1 @@
+82cf53b4ac868392a431d7a96d9ac5cc
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/maven-metadata.xml.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/maven-metadata.xml.sha1
new file mode 100644
index 0000000..64219bc
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/rxjava2/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+7481e0f93fca8fcbbdf5693733d24bb2cc7c12be
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT-sources.jar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT-sources.jar
new file mode 100644
index 0000000..6a8da3b
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT-sources.jar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT-sources.jar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT-sources.jar.md5
new file mode 100644
index 0000000..0da4d5c
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT-sources.jar.md5
@@ -0,0 +1 @@
+d0a4dde9edb7a7e2859837b66fbe0c9a
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT-sources.jar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT-sources.jar.sha1
new file mode 100644
index 0000000..9344dc0
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT-sources.jar.sha1
@@ -0,0 +1 @@
+1682ac7c53c77a006186078fc762eca9397379e2
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT.aar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT.aar
new file mode 100644
index 0000000..2247eb9
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT.aar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT.aar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT.aar.md5
new file mode 100644
index 0000000..941aa7e
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT.aar.md5
@@ -0,0 +1 @@
+7684417fe769415eebe75dc1018def83
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT.aar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT.aar.sha1
new file mode 100644
index 0000000..8059aa5c
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT.aar.sha1
@@ -0,0 +1 @@
+46b52ea9748e47b6b149426306189a697b750e47
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT.pom b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT.pom
new file mode 100644
index 0000000..73afcf1
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT.pom
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>android.arch.persistence.room</groupId>
+  <artifactId>support-db-impl</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>aar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>support-annotations</artifactId>
+      <version>25.2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>android.arch.persistence.room</groupId>
+      <artifactId>support-db</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT.pom.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT.pom.md5
new file mode 100644
index 0000000..d5372bd
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT.pom.md5
@@ -0,0 +1 @@
+380065e2dc039d8d34076288bb2ea938
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT.pom.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT.pom.sha1
new file mode 100644
index 0000000..9559b0e
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/1.0-SNAPSHOT/support-db-impl-1.0-SNAPSHOT.pom.sha1
@@ -0,0 +1 @@
+c532878901a9aea9a5524ae24f14a065c5a3b87e
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/maven-metadata.xml b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/maven-metadata.xml
new file mode 100644
index 0000000..e404c0d
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/maven-metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>android.arch.persistence.room</groupId>
+  <artifactId>support-db-impl</artifactId>
+  <versioning>
+    <versions>
+      <version>1.0-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20170425234931</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/maven-metadata.xml.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/maven-metadata.xml.md5
new file mode 100644
index 0000000..508796f
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/maven-metadata.xml.md5
@@ -0,0 +1 @@
+193f551a7bc9d7430731297e1551eb34
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/maven-metadata.xml.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/maven-metadata.xml.sha1
new file mode 100644
index 0000000..6263deb
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db-impl/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+bc8eb4ad533da9815cd853ecdaa02156bbdc107d
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT-sources.jar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT-sources.jar
new file mode 100644
index 0000000..e9366eb
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT-sources.jar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT-sources.jar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT-sources.jar.md5
new file mode 100644
index 0000000..85b99c9
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT-sources.jar.md5
@@ -0,0 +1 @@
+e022ba4008d3cad5e3b9e6318e361de1
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT-sources.jar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT-sources.jar.sha1
new file mode 100644
index 0000000..56ba90b
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT-sources.jar.sha1
@@ -0,0 +1 @@
+521ea0832becfc4ef4ccd254e1744afb265997b8
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT.aar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT.aar
new file mode 100644
index 0000000..03387c6
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT.aar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT.aar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT.aar.md5
new file mode 100644
index 0000000..03d4b55
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT.aar.md5
@@ -0,0 +1 @@
+3b4bf6c9c90441018d6f26c276969165
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT.aar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT.aar.sha1
new file mode 100644
index 0000000..c521308
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT.aar.sha1
@@ -0,0 +1 @@
+9624a1f9484ed924fd843f467d76d8bdf83e3a7b
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT.pom b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT.pom
new file mode 100644
index 0000000..16e3450
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT.pom
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>android.arch.persistence.room</groupId>
+  <artifactId>support-db</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>aar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>support-annotations</artifactId>
+      <version>25.2.0</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT.pom.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT.pom.md5
new file mode 100644
index 0000000..b3cc2ff
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT.pom.md5
@@ -0,0 +1 @@
+efe1c96944a927073adda14ff86c2135
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT.pom.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT.pom.sha1
new file mode 100644
index 0000000..a180ef34
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/1.0-SNAPSHOT/support-db-1.0-SNAPSHOT.pom.sha1
@@ -0,0 +1 @@
+b85080854ab0c7856175b5bc235f07392df97b77
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/maven-metadata.xml b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/maven-metadata.xml
new file mode 100644
index 0000000..dddc3f6
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/maven-metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>android.arch.persistence.room</groupId>
+  <artifactId>support-db</artifactId>
+  <versioning>
+    <versions>
+      <version>1.0-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20170425234931</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/maven-metadata.xml.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/maven-metadata.xml.md5
new file mode 100644
index 0000000..81bb858
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/maven-metadata.xml.md5
@@ -0,0 +1 @@
+019686ab20dcecca132aec3eee2108f0
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/maven-metadata.xml.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/maven-metadata.xml.sha1
new file mode 100644
index 0000000..ca11e9a
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/support-db/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+66ff620355adbd64b4a0e4e0996389bfab3fb360
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT-sources.jar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT-sources.jar
new file mode 100644
index 0000000..490b0d0
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT-sources.jar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT-sources.jar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT-sources.jar.md5
new file mode 100644
index 0000000..dbbf413
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT-sources.jar.md5
@@ -0,0 +1 @@
+2dcffd9944c07354a3fd73c3d385b1be
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT-sources.jar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT-sources.jar.sha1
new file mode 100644
index 0000000..3c3995c
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT-sources.jar.sha1
@@ -0,0 +1 @@
+e766fa0ccca43091b04f69d12a2329ce06b177ca
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT.aar b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT.aar
new file mode 100644
index 0000000..644763a
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT.aar
Binary files differ
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT.aar.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT.aar.md5
new file mode 100644
index 0000000..3f37cb9
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT.aar.md5
@@ -0,0 +1 @@
+89363c7907b91c220efd465389d3a50d
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT.aar.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT.aar.sha1
new file mode 100644
index 0000000..0e44e55
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT.aar.sha1
@@ -0,0 +1 @@
+23abf85900dc4c6829c3cd226dd464ff927fe8dc
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT.pom b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT.pom
new file mode 100644
index 0000000..2dcfd21
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT.pom
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>android.arch.persistence.room</groupId>
+  <artifactId>testing</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>aar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>android.arch.persistence.room</groupId>
+      <artifactId>common</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>android.arch.persistence.room</groupId>
+      <artifactId>runtime</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>android.arch.persistence.room</groupId>
+      <artifactId>support-db</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>android.arch.persistence.room</groupId>
+      <artifactId>support-db-impl</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>android.arch.persistence.room</groupId>
+      <artifactId>migration</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>android.arch.core</groupId>
+      <artifactId>core</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>support-core-utils</artifactId>
+      <version>25.2.0</version>
+      <type>aar</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT.pom.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT.pom.md5
new file mode 100644
index 0000000..c23ae1f
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT.pom.md5
@@ -0,0 +1 @@
+b2d898c8bb743adc72f38117f0872307
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT.pom.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT.pom.sha1
new file mode 100644
index 0000000..66ffac0
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/1.0-SNAPSHOT/testing-1.0-SNAPSHOT.pom.sha1
@@ -0,0 +1 @@
+9437b86303114f2e088d3cfc129dbe656a797664
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/maven-metadata.xml b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/maven-metadata.xml
new file mode 100644
index 0000000..216b8e3
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/maven-metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>android.arch.persistence.room</groupId>
+  <artifactId>testing</artifactId>
+  <versioning>
+    <versions>
+      <version>1.0-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20170425234933</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/maven-metadata.xml.md5 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/maven-metadata.xml.md5
new file mode 100644
index 0000000..dd12859
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/maven-metadata.xml.md5
@@ -0,0 +1 @@
+b8ed134889e32a793e3661d1f16d9cf9
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/maven-metadata.xml.sha1 b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/maven-metadata.xml.sha1
new file mode 100644
index 0000000..54b358d
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/android/arch/persistence/room/testing/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+78dfddf7da9141c94e632d00e4c702a93c637068
\ No newline at end of file
diff --git a/samples-flatfoot/codelabs/prebuilts2604/source.properties b/samples-flatfoot/codelabs/prebuilts2604/source.properties
new file mode 100644
index 0000000..dcac712
--- /dev/null
+++ b/samples-flatfoot/codelabs/prebuilts2604/source.properties
@@ -0,0 +1,8 @@
+Extra.VendorDisplay=Android
+Extra.Path=m2repository
+Archive.Arch=ANY
+Extra.NameDisplay=Android Support Repository
+Archive.Os=ANY
+Pkg.Desc=Local Maven repository for Support Libraries
+Pkg.Revision=46.0.0
+Extra.VendorId=android
\ No newline at end of file