Merge branch 'master' into version-3.0.1-dev

Change-Id: Id1cb7418e08a898ba54b0cb596f051e658e2f363

Author: samtstern

app/src/main/java/com/firebase/uidemo/database/firestore/FirestoreChatActivity.java

@@ -19,7 +19,6 @@
 import com.firebase.ui.firestore.FirestoreRecyclerOptions;
 import com.firebase.uidemo.R;
 import com.firebase.uidemo.database.ChatHolder;
-import com.firebase.uidemo.database.realtime.Chat;
 import com.firebase.uidemo.util.SignInResultNotifier;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.firebase.auth.FirebaseAuth;