diff --git a/proguard.flags b/proguard.flags
index 4e0c310..d7f443e 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -6,3 +6,21 @@
 -keep class android.telecom.Log {
   *;
 }
+
+# Keep classes, annotations and members used by Lifecycle. Remove this once aapt2 is enabled
+-keepattributes *Annotation*
+
+-keepclassmembers enum android.arch.lifecycle.Lifecycle$Event {
+    <fields>;
+}
+
+-keep class * implements android.arch.lifecycle.LifecycleObserver {
+}
+
+-keep class * implements android.arch.lifecycle.GeneratedAdapter {
+    <init>(...);
+}
+
+-keepclassmembers class ** {
+    @android.arch.lifecycle.OnLifecycleEvent *;
+}