diff --git a/wlauto/common/android/BaseUiAutomation$1.class b/wlauto/common/android/BaseUiAutomation$1.class
index fea7e68c..5a216cc3 100644
Binary files a/wlauto/common/android/BaseUiAutomation$1.class and b/wlauto/common/android/BaseUiAutomation$1.class differ
diff --git a/wlauto/common/android/BaseUiAutomation$ActionLogger.class b/wlauto/common/android/BaseUiAutomation$ActionLogger.class
index 581e1e8b..bde4b8f2 100644
Binary files a/wlauto/common/android/BaseUiAutomation$ActionLogger.class and b/wlauto/common/android/BaseUiAutomation$ActionLogger.class differ
diff --git a/wlauto/common/android/BaseUiAutomation.class b/wlauto/common/android/BaseUiAutomation.class
index 822000ec..2188bd5f 100644
Binary files a/wlauto/common/android/BaseUiAutomation.class and b/wlauto/common/android/BaseUiAutomation.class differ
diff --git a/wlauto/external/uiauto/src/com/arm/wlauto/uiauto/BaseUiAutomation.java b/wlauto/external/uiauto/src/com/arm/wlauto/uiauto/BaseUiAutomation.java
index 5f0c9c8a..eb1e583b 100755
--- a/wlauto/external/uiauto/src/com/arm/wlauto/uiauto/BaseUiAutomation.java
+++ b/wlauto/external/uiauto/src/com/arm/wlauto/uiauto/BaseUiAutomation.java
@@ -89,13 +89,13 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
 
         public void start() {
             if (enabled) {
-                Log.d("UX_PERF", testTag + "_start " + System.nanoTime());
+                Log.d("UX_PERF", testTag + "_start " + System.currentTimeMillis());
             }
         }
 
         public void stop() throws Exception {
             if (enabled) {
-                Log.d("UX_PERF", testTag + "_end " + System.nanoTime());
+                Log.d("UX_PERF", testTag + "_end " + System.currentTimeMillis());
             }
         }
     }
@@ -228,6 +228,7 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
         UiDevice.getInstance().pressEnter();
     }
 
+
     public void pressBack() {
         UiDevice.getInstance().pressBack();
     }
diff --git a/wlauto/result_processors/uxperf.py b/wlauto/result_processors/uxperf.py
index 5029362a..ff9027f8 100755
--- a/wlauto/result_processors/uxperf.py
+++ b/wlauto/result_processors/uxperf.py
@@ -185,7 +185,7 @@ class UxPerfParser(object):
         for action, timestamps in self.actions.iteritems():
             # nanosecond precision, but not necessarily nanosecond resolution
             # truncate to guarantee millisecond precision
-            ts_ms = tuple(int(ts[:-6]) for ts in timestamps)
+            ts_ms = tuple(int(ts) for ts in timestamps)
             if len(ts_ms) == 2:
                 start, finish = ts_ms
                 duration = finish - start
diff --git a/wlauto/workloads/adobereader/com.arm.wlauto.uiauto.adobereader.jar b/wlauto/workloads/adobereader/com.arm.wlauto.uiauto.adobereader.jar
index f9337861..a99b0d70 100644
Binary files a/wlauto/workloads/adobereader/com.arm.wlauto.uiauto.adobereader.jar and b/wlauto/workloads/adobereader/com.arm.wlauto.uiauto.adobereader.jar differ
diff --git a/wlauto/workloads/gmail/com.arm.wlauto.uiauto.gmail.jar b/wlauto/workloads/gmail/com.arm.wlauto.uiauto.gmail.jar
index d21cfab3..12e12841 100644
Binary files a/wlauto/workloads/gmail/com.arm.wlauto.uiauto.gmail.jar and b/wlauto/workloads/gmail/com.arm.wlauto.uiauto.gmail.jar differ
diff --git a/wlauto/workloads/googlephotos/com.arm.wlauto.uiauto.googlephotos.jar b/wlauto/workloads/googlephotos/com.arm.wlauto.uiauto.googlephotos.jar
index 2f02375e..02fd6d25 100644
Binary files a/wlauto/workloads/googlephotos/com.arm.wlauto.uiauto.googlephotos.jar and b/wlauto/workloads/googlephotos/com.arm.wlauto.uiauto.googlephotos.jar differ
diff --git a/wlauto/workloads/googleplaybooks/com.arm.wlauto.uiauto.googleplaybooks.jar b/wlauto/workloads/googleplaybooks/com.arm.wlauto.uiauto.googleplaybooks.jar
index f08e1257..21062cab 100644
Binary files a/wlauto/workloads/googleplaybooks/com.arm.wlauto.uiauto.googleplaybooks.jar and b/wlauto/workloads/googleplaybooks/com.arm.wlauto.uiauto.googleplaybooks.jar differ
diff --git a/wlauto/workloads/googleslides/com.arm.wlauto.uiauto.googleslides.jar b/wlauto/workloads/googleslides/com.arm.wlauto.uiauto.googleslides.jar
index 860507ad..0d8af41b 100644
Binary files a/wlauto/workloads/googleslides/com.arm.wlauto.uiauto.googleslides.jar and b/wlauto/workloads/googleslides/com.arm.wlauto.uiauto.googleslides.jar differ
diff --git a/wlauto/workloads/skype/com.arm.wlauto.uiauto.skype.jar b/wlauto/workloads/skype/com.arm.wlauto.uiauto.skype.jar
index 5fc663ba..34ba170c 100644
Binary files a/wlauto/workloads/skype/com.arm.wlauto.uiauto.skype.jar and b/wlauto/workloads/skype/com.arm.wlauto.uiauto.skype.jar differ
diff --git a/wlauto/workloads/youtube/com.arm.wlauto.uiauto.youtube.jar b/wlauto/workloads/youtube/com.arm.wlauto.uiauto.youtube.jar
index 9aad9634..fb4f68a5 100644
Binary files a/wlauto/workloads/youtube/com.arm.wlauto.uiauto.youtube.jar and b/wlauto/workloads/youtube/com.arm.wlauto.uiauto.youtube.jar differ