diff --git a/wa/workloads/gmail/__init__.py b/wa/workloads/gmail/__init__.py
new file mode 100755
index 00000000..abc16a9c
--- /dev/null
+++ b/wa/workloads/gmail/__init__.py
@@ -0,0 +1,71 @@
+#    Copyright 2014-2016 ARM Limited
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import os
+
+from wa import ApkUiautoWorkload, Parameter
+from wa.framework.exception import ValidationError, WorkloadError
+
+
+class Gmail(ApkUiautoWorkload):
+
+    name = 'gmail'
+    package_names = ['com.google.android.gm']
+    description = '''
+    A workload to perform standard productivity tasks within Gmail.  The workload carries out
+    various tasks, such as creating new emails, attaching images and sending them.
+
+    Test description:
+    1. Open Gmail application
+    2. Click to create New mail
+    3. Attach an image from the local images folder to the email
+    4. Enter recipient details in the To field
+    5. Enter text in the Subject field
+    6. Enter text in the Compose field
+    7. Click the Send mail button
+
+    Known working APK version: 7.11.5.176133587
+    '''
+
+    parameters = [
+        Parameter('recipient', kind=str, default='wa-devnull@mailinator.com',
+                  description='''
+                  The email address of the recipient.  Setting a void address
+                  will stop any mesage failures clogging up your device inbox
+                  '''),
+        Parameter('test_image', kind=str, default='uxperf_1600x1200.jpg',
+                  description='''
+                  An image to be copied onto the device that will be attached
+                  to the email
+                  '''),
+    ]
+
+    # This workload relies on the internet so check that there is a working
+    # internet connection
+    requires_network = True
+
+    def __init__(self, target, **kwargs):
+        super(Gmail, self).__init__(target, **kwargs)
+        self.deployable_assets = [self.test_image]
+        self.clean_assets = True
+
+    def init_resources(self, context):
+        super(Gmail, self).init_resources(context)
+        if self.target.get_sdk_version() >= 24 and 'com.google.android.apps.photos' not in self.target.list_packages():
+            raise WorkloadError('gmail workload requires Google Photos to be installed for Android N onwards')
+        self.gui.uiauto_params['recipient'] = self.recipient
+        # Only accept certain image formats
+        if os.path.splitext(self.test_image.lower())[1] not in ['.jpg', '.jpeg', '.png']:
+            raise ValidationError('{} must be a JPEG or PNG file'.format(self.test_image))
diff --git a/wa/workloads/gmail/com.arm.wa.uiauto.gmail.apk b/wa/workloads/gmail/com.arm.wa.uiauto.gmail.apk
new file mode 100644
index 00000000..1961c214
Binary files /dev/null and b/wa/workloads/gmail/com.arm.wa.uiauto.gmail.apk differ
diff --git a/wa/workloads/gmail/uiauto/app/build.gradle b/wa/workloads/gmail/uiauto/app/build.gradle
new file mode 100644
index 00000000..c151093a
--- /dev/null
+++ b/wa/workloads/gmail/uiauto/app/build.gradle
@@ -0,0 +1,41 @@
+apply plugin: 'com.android.application'
+
+def packageName = "com.arm.wa.uiauto.gmail"
+
+android {
+    compileSdkVersion 25
+    buildToolsVersion "25.0.3"
+    defaultConfig {
+        applicationId "${packageName}"
+        minSdkVersion 18
+        targetSdkVersion 25
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+        applicationVariants.all { variant ->
+            variant.outputs.each { output ->
+                output.outputFile = file("$project.buildDir/apk/${packageName}.apk")
+            }
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.android.support.test:runner:0.5'
+    compile 'com.android.support.test:rules:0.5'
+    compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+    compile(name: 'uiauto', ext:'aar')
+}
+
+repositories {
+    flatDir {
+        dirs 'libs'
+    }
+}
diff --git a/wa/workloads/gmail/uiauto/app/src/main/AndroidManifest.xml b/wa/workloads/gmail/uiauto/app/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..74bca3b3
--- /dev/null
+++ b/wa/workloads/gmail/uiauto/app/src/main/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.arm.wa.uiauto.gmail"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="${applicationId}"/>
+
+</manifest>
+
diff --git a/wa/workloads/gmail/uiauto/app/src/main/java/com/arm/wa/uiauto/gmail/UiAutomation.java b/wa/workloads/gmail/uiauto/app/src/main/java/com/arm/wa/uiauto/gmail/UiAutomation.java
new file mode 100755
index 00000000..7271ee4e
--- /dev/null
+++ b/wa/workloads/gmail/uiauto/app/src/main/java/com/arm/wa/uiauto/gmail/UiAutomation.java
@@ -0,0 +1,280 @@
+/*    Copyright 2014-2016 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.arm.wa.uiauto.gmail;
+
+import android.os.Bundle;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.UiObject;
+import android.support.test.uiautomator.UiObjectNotFoundException;
+import android.support.test.uiautomator.UiSelector;
+
+import com.arm.wa.uiauto.ApplaunchInterface;
+import com.arm.wa.uiauto.BaseUiAutomation;
+import com.arm.wa.uiauto.ActionLogger;
+import com.arm.wa.uiauto.UiAutoUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.concurrent.TimeUnit;
+
+@RunWith(AndroidJUnit4.class)
+public class UiAutomation extends BaseUiAutomation implements ApplaunchInterface {
+
+    protected Bundle parameters;
+    protected String packageID;
+    protected String recipient;
+
+    private int networkTimeoutSecs = 30;
+    private long networkTimeout =  TimeUnit.SECONDS.toMillis(networkTimeoutSecs);
+
+    @Before
+    public void initialize() {
+        parameters = getParams();
+        packageID = getPackageID(parameters);
+        recipient = parameters.getString("recipient");
+    }
+
+    @Test
+    public void setup() throws Exception {
+        setScreenOrientation(ScreenOrientation.NATURAL);
+        runApplicationSetup();
+    }
+
+    @Test
+    public void runWorkload() throws Exception {
+        clickNewMail();
+        attachImage();
+        setToField(recipient);
+        setSubjectField();
+        setComposeField();
+        clickSendButton();
+    }
+
+    @Test
+    public void teardown() throws Exception {
+        unsetScreenOrientation();
+    }
+
+    public void runApplicationSetup() throws Exception {
+        clearFirstRunDialogues();
+    }
+
+    // Sets the UiObject that marks the end of the application launch.
+    public UiObject getLaunchEndObject() {
+        UiObject launchEndObject =
+                        mDevice.findObject(new UiSelector().className("android.widget.ImageButton"));
+        return launchEndObject;
+    }
+
+    // Returns the launch command for the application.
+    public String getLaunchCommand() {
+        String launch_command;
+        launch_command = UiAutoUtils.createLaunchCommand(parameters);
+        return launch_command;
+    }
+
+    // Pass the workload parameters, used for applaunch
+    public void setWorkloadParameters(Bundle workload_parameters) {
+        parameters = workload_parameters;
+        packageID = getPackageID(parameters);
+    }
+
+    public void clearFirstRunDialogues() throws Exception {
+        // The first run dialogues vary on different devices so check if they are there and dismiss
+        UiObject gotItBox =
+            mDevice.findObject(new UiSelector().resourceId(packageID + "welcome_tour_got_it")
+                                         .className("android.widget.TextView"));
+        if (gotItBox.exists()) {
+            gotItBox.clickAndWaitForNewWindow(uiAutoTimeout);
+        }
+
+        UiObject takeMeToBox =
+            mDevice.findObject(new UiSelector().textContains("Take me to Gmail")
+                                         .className("android.widget.TextView"));
+        if (takeMeToBox.exists()) {
+            takeMeToBox.clickAndWaitForNewWindow(uiAutoTimeout);
+        }
+
+        UiObject syncNowButton =
+            mDevice.findObject(new UiSelector().textContains("Sync now")
+                                         .className("android.widget.Button"));
+        if (syncNowButton.exists()) {
+            syncNowButton.clickAndWaitForNewWindow(uiAutoTimeout);
+            // On some devices we need to wait for a sync to occur after clearing the data
+            // We also need to sleep here since waiting for a new window is not enough
+            sleep(10);
+        }
+
+        // Wait an obnoxiously long period of time for the sync operation to finish
+        // If it still fails, then there is a problem with the app obtaining the data it needs
+        // Recommend restarting the phone and/or clearing the app data
+        UiObject gettingMessages =
+            mDevice.findObject(new UiSelector().textContains("Getting your messages")
+                                               .className("android.widget.TextView"));
+        UiObject waitingSync =
+            mDevice.findObject(new UiSelector().textContains("Waiting for sync")
+                                               .className("android.widget.TextView"));
+        if (!waitUntilNoObject(gettingMessages, networkTimeoutSecs*4) ||
+            !waitUntilNoObject(waitingSync, networkTimeoutSecs*4)) {
+            throw new UiObjectNotFoundException("Device cannot sync! Try rebooting or clearing app data");
+        }
+    }
+
+    public void clickNewMail() throws Exception {
+        String testTag = "click_new";
+        ActionLogger logger = new ActionLogger(testTag, parameters);
+
+        UiObject conversationView =
+            mDevice.findObject(new UiSelector().resourceIdMatches(packageID + "conversation_list.*"));
+        if (!conversationView.waitForExists(networkTimeout)) {
+            throw new UiObjectNotFoundException("Could not find \"conversationView\".");
+        }
+
+        UiObject newMailButton =
+            getUiObjectByDescription("Compose", "android.widget.ImageButton");
+        logger.start();
+        newMailButton.clickAndWaitForNewWindow(uiAutoTimeout);
+        logger.stop();
+    }
+
+    public void attachImage() throws Exception {
+        String testTag = "attach_img";
+        ActionLogger logger = new ActionLogger(testTag, parameters);
+
+        UiObject attachIcon =
+            getUiObjectByResourceId(packageID + "add_attachment", "android.widget.TextView");
+
+        logger.start();
+
+        attachIcon.click();
+        UiObject attachFile =
+            getUiObjectByText("Attach file", "android.widget.TextView");
+        attachFile.clickAndWaitForNewWindow(uiAutoTimeout);
+
+        // Show Roots menu
+        UiObject rootMenu =
+            mDevice.findObject(new UiSelector().descriptionContains("Show roots")
+                                               .className("android.widget.ImageButton"));
+        if (rootMenu.exists()){
+            rootMenu.click();
+        }
+        // Check for Photos
+        UiObject photos =
+            mDevice.findObject(new UiSelector().text("Photos")
+                                               .className("android.widget.TextView"));
+        // If Photos does not exist use the images folder
+        if (!photos.waitForExists (uiAutoTimeout)) {
+            UiObject imagesEntry =
+                mDevice.findObject(new UiSelector().textContains("Images")
+                                                   .className("android.widget.TextView"));
+            if (imagesEntry.waitForExists(uiAutoTimeout)) {
+                imagesEntry.click();
+            }
+            selectGalleryFolder("wa");
+
+            UiObject imageButton =
+            mDevice.findObject(new UiSelector().resourceId("com.android.documentsui:id/grid")
+                                               .className("android.widget.Gridview")
+                                               .childSelector(new UiSelector().index(0)
+                                               .className("android.widget.FrameLayout")));
+            if (!imageButton.exists()){
+                imageButton =
+                    mDevice.findObject(new UiSelector().resourceId("com.android.documentsui:id/dir_list")
+                                                       .childSelector(new UiSelector().index(0)
+                                                       .classNameMatches("android.widget..*Layout")));
+                }
+            imageButton.click();
+            imageButton.waitUntilGone(uiAutoTimeout);
+        } else {
+            photos.click();
+            //Click wa folder image
+            UiObject waFolder =
+            mDevice.findObject(new UiSelector().textContains("wa")
+                                               .className("android.widget.TextView"));
+            if (!waFolder.waitForExists (uiAutoTimeout)) {
+                UiObject refresh =
+                    getUiObjectByResourceId("com.google.android.apps.photos:id/image");
+                    refresh.clickAndWaitForNewWindow();
+                UiObject back =
+                    getUiObjectByResourceId("com.google.android.apps.photos:id/action_mode_close_button");
+                    back.clickAndWaitForNewWindow();
+            }
+            waFolder.waitForExists (uiAutoTimeout);
+            waFolder.click();
+            //Click test image
+            UiObject imageFileButton =
+                mDevice.findObject(new UiSelector().descriptionContains("Photo"));
+            imageFileButton.click();
+            UiObject accept = getUiObjectByText("DONE");
+            if (accept.waitForExists (uiAutoTimeout)) {
+                accept.click();
+            }
+        }
+        logger.stop();
+    }
+
+    public void setToField(String recipient) throws Exception {
+        String testTag = "text_to";
+        ActionLogger logger = new ActionLogger(testTag, parameters);
+
+        UiObject toField = getUiObjectByResourceId(packageID + "to");
+        logger.start();
+        toField.setText(recipient);
+        mDevice.pressEnter();
+        logger.stop();
+    }
+
+    public void setSubjectField() throws Exception {
+        String testTag = "text_subject";
+        ActionLogger logger = new ActionLogger(testTag, parameters);
+
+        UiObject subjectField = getUiObjectByText("Subject", "android.widget.EditText");
+        logger.start();
+        // Click on the subject field is required on some platforms to exit the To box cleanly
+        subjectField.click();
+        subjectField.setText("This is a test message");
+        mDevice.pressEnter();
+        logger.stop();
+    }
+
+    public void setComposeField() throws Exception {
+        String testTag = "text_body";
+        ActionLogger logger = new ActionLogger(testTag, parameters);
+
+        UiObject composeField = mDevice.findObject(new UiSelector().textContains("Compose email")                                                   );
+        if (!composeField.exists()){
+            composeField = mDevice.findObject(new UiSelector().descriptionContains("Compose email"));
+        }
+
+        logger.start();
+        composeField.legacySetText("This is a test composition");
+        mDevice.pressEnter();
+        logger.stop();
+    }
+
+    public void clickSendButton() throws Exception {
+        String testTag = "click_send";
+        ActionLogger logger = new ActionLogger(testTag, parameters);
+
+        UiObject sendButton = getUiObjectByDescription("Send", "android.widget.TextView");
+        logger.start();
+        sendButton.clickAndWaitForNewWindow(uiAutoTimeout);
+        logger.stop();
+        sendButton.waitUntilGone(networkTimeoutSecs);
+    }
+}
diff --git a/wa/workloads/gmail/uiauto/build.gradle b/wa/workloads/gmail/uiauto/build.gradle
new file mode 100644
index 00000000..d0aa7043
--- /dev/null
+++ b/wa/workloads/gmail/uiauto/build.gradle
@@ -0,0 +1,23 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.3.2'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/wa/workloads/gmail/uiauto/build.sh b/wa/workloads/gmail/uiauto/build.sh
new file mode 100755
index 00000000..b2f099f0
--- /dev/null
+++ b/wa/workloads/gmail/uiauto/build.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# CD into build dir if possible - allows building from any directory
+script_path='.'
+if `readlink -f $0 &>/dev/null`; then
+    script_path=`readlink -f $0 2>/dev/null`
+fi
+script_dir=`dirname $script_path`
+cd $script_dir
+
+# Ensure gradelw exists before starting
+if [[ ! -f gradlew ]]; then
+    echo 'gradlew file not found! Check that you are in the right directory.'
+    exit 9
+fi
+
+# Copy base class library from wa dist
+libs_dir=app/libs
+base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"`
+mkdir -p $libs_dir
+cp $base_class $libs_dir
+
+# Build and return appropriate exit code if failed
+# gradle build
+./gradlew clean :app:assembleDebug
+exit_code=$?
+if [[ $exit_code -ne 0 ]]; then
+    echo "ERROR: 'gradle build' exited with code $exit_code"
+    exit $exit_code
+fi
+
+# If successful move APK file to workload folder (overwrite previous)
+package=com.arm.wa.uiauto.gmail
+rm -f ../$package
+if [[ -f app/build/apk/$package.apk ]]; then
+    cp app/build/apk/$package.apk ../$package.apk
+else
+    echo 'ERROR: UiAutomator apk could not be found!'
+    exit 9
+fi
diff --git a/wa/workloads/gmail/uiauto/gradle/wrapper/gradle-wrapper.jar b/wa/workloads/gmail/uiauto/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..13372aef
Binary files /dev/null and b/wa/workloads/gmail/uiauto/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/wa/workloads/gmail/uiauto/gradle/wrapper/gradle-wrapper.properties b/wa/workloads/gmail/uiauto/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..760fcce7
--- /dev/null
+++ b/wa/workloads/gmail/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed May 03 15:42:44 BST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/wa/workloads/gmail/uiauto/gradlew b/wa/workloads/gmail/uiauto/gradlew
new file mode 100755
index 00000000..9d82f789
--- /dev/null
+++ b/wa/workloads/gmail/uiauto/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/wa/workloads/gmail/uiauto/gradlew.bat b/wa/workloads/gmail/uiauto/gradlew.bat
new file mode 100644
index 00000000..aec99730
--- /dev/null
+++ b/wa/workloads/gmail/uiauto/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/wa/workloads/gmail/uiauto/settings.gradle b/wa/workloads/gmail/uiauto/settings.gradle
new file mode 100644
index 00000000..e7b4def4
--- /dev/null
+++ b/wa/workloads/gmail/uiauto/settings.gradle
@@ -0,0 +1 @@
+include ':app'