Merge commit '4892560725f3a0ea650cd93d3760a04654999a22' into dev-release

Change-Id: I043f1f6488c50aea57539242a7ad77be6296cf5a
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index b725385..9f12d9d 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -13,7 +13,7 @@
 
   // This field is accessed from release scripts using simple pattern matching.
   // Therefore, changing this field could break our release scripts.
-  public static final String LABEL = "main";
+  public static final String LABEL = "8.5.4-dev";
 
   private Version() {
   }