diff --git a/appengine/images/README.md b/appengine/images/README.md
new file mode 100644
index 00000000000..88edaa825f2
--- /dev/null
+++ b/appengine/images/README.md
@@ -0,0 +1,36 @@
+# Google App Engine Standard Environment Images Sample
+
+This sample demonstrates how to use the Images Java API.
+
+See the [Google App Engine standard environment documentation][ae-docs] for more
+detailed instructions.
+
+[ae-docs]: https://cloud.google.com/appengine/docs/java/
+
+## Modify the app
+
+Using the [Google Cloud SDK](https://cloud.google.com/sdk/) create a bucket
+
+    $ gsutil mb YOUR-PROJECT-ID.appspot.com
+
+* Edit `src/main/java/com/example/appengine/images/ImageServlet.java` and set your `bucket` name.
+
+## Running locally
+
+ This example uses the
+ [App Engine maven plugin](https://cloud.google.com/appengine/docs/java/tools/maven).
+ To run this sample locally:
+
+     $ mvn appengine:devserver
+
+ To see the results of the sample application, open
+ [localhost:8080](http://localhost:8080) in a web browser.
+
+
+## Deploying
+
+ In the following command, replace YOUR-PROJECT-ID with your
+ [Google Cloud Project ID](https://developers.google.com/console/help/new/#projectnumber)
+ and SOME-VERSION with a valid version number.
+
+     $ mvn appengine:update -Dappengine.appId=YOUR-PROJECT-ID -Dappengine.version=SOME-VERSION
diff --git a/appengine/images/pom.xml b/appengine/images/pom.xml
new file mode 100644
index 00000000000..afd735da9aa
--- /dev/null
+++ b/appengine/images/pom.xml
@@ -0,0 +1,73 @@
+<!--
+Copyright 2015 Google Inc. All Rights Reserved.
+
+ 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.
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>war</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <groupId>com.example.appengine</groupId>
+  <artifactId>appengine-images</artifactId>
+
+  <properties>
+      <appengine.sdk.version>1.9.24</appengine.sdk.version>
+  </properties>
+
+  <parent>
+    <groupId>com.google.cloud</groupId>
+    <artifactId>doc-samples</artifactId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-api-1.0-sdk</artifactId>
+       <version>${appengine.sdk.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.appengine.tools</groupId>
+      <artifactId>appengine-gcs-client</artifactId>
+      <version>RELEASE</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <type>jar</type>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <!-- for hot reload of the web application -->
+    <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <version>3.3</version>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
+      <plugin>
+        <groupId>com.google.appengine</groupId>
+        <artifactId>appengine-maven-plugin</artifactId>
+        <version>${appengine.sdk.version}</version>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/appengine/images/src/main/java/com/example/appengine/images/ImagesServlet.java b/appengine/images/src/main/java/com/example/appengine/images/ImagesServlet.java
new file mode 100644
index 00000000000..a864cd62c64
--- /dev/null
+++ b/appengine/images/src/main/java/com/example/appengine/images/ImagesServlet.java
@@ -0,0 +1,118 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * 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.example.appengine.images;
+import com.google.appengine.api.blobstore.BlobKey;
+import com.google.appengine.api.blobstore.BlobstoreService;
+import com.google.appengine.api.blobstore.BlobstoreServiceFactory;
+import com.google.appengine.api.images.Image;
+import com.google.appengine.api.images.ImagesService;
+import com.google.appengine.api.images.ImagesServiceFactory;
+import com.google.appengine.api.images.Transform;
+import com.google.appengine.tools.cloudstorage.GcsFileOptions;
+import com.google.appengine.tools.cloudstorage.GcsFilename;
+import com.google.appengine.tools.cloudstorage.GcsService;
+import com.google.appengine.tools.cloudstorage.GcsServiceFactory;
+import com.google.appengine.tools.cloudstorage.RetryParams;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+// [START example]
+@SuppressWarnings("serial")
+public class ImagesServlet extends HttpServlet {
+  final String bucket = "YOUR-BUCKETNAME-HERE";
+
+  // [START gcs]
+  private final GcsService gcsService = GcsServiceFactory.createGcsService(new RetryParams.Builder()
+      .initialRetryDelayMillis(10)
+      .retryMaxAttempts(10)
+      .totalRetryPeriodMillis(15000)
+      .build());
+  // [END gcs]
+
+  @Override
+  public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+
+    //[START original_image]
+    // Read the image.jpg resource into a ByteBuffer.
+    FileInputStream fileInputStream = new FileInputStream(new File("WEB-INF/image.jpg"));
+    FileChannel fileChannel = fileInputStream.getChannel();
+    ByteBuffer byteBuffer = ByteBuffer.allocate((int)fileChannel.size());
+    fileChannel.read(byteBuffer);
+    
+    byte[] imageBytes = byteBuffer.array();
+
+    // Write the original image to Cloud Storage
+    gcsService.createOrReplace(
+        new GcsFilename(bucket, "image.jpeg"),
+        new GcsFileOptions.Builder().mimeType("image/jpeg").build(),
+        ByteBuffer.wrap(imageBytes));
+    //[END original_image]
+
+    //[START resize]
+    // Get an instance of the imagesService we can use to transform images.
+    ImagesService imagesService = ImagesServiceFactory.getImagesService();
+
+    // Make an image directly from a byte array, and transform it.
+    Image image = ImagesServiceFactory.makeImage(imageBytes);
+    Transform resize = ImagesServiceFactory.makeResize(100, 50);
+    Image resizedImage = imagesService.applyTransform(resize, image);
+
+    // Write the transformed image back to a Cloud Storage object.
+    gcsService.createOrReplace(
+        new GcsFilename(bucket, "resizedImage.jpeg"),
+        new GcsFileOptions.Builder().mimeType("image/jpeg").build(),
+        ByteBuffer.wrap(resizedImage.getImageData()));
+    //[END resize]
+
+    //[START rotate]
+    // Make an image from a Cloud Storage object, and transform it.
+    BlobstoreService blobstoreService = BlobstoreServiceFactory.getBlobstoreService();
+    BlobKey blobKey = blobstoreService.createGsBlobKey("gs://" + bucket + "/image.jpeg");
+    Image blobImage = ImagesServiceFactory.makeImageFromBlob(blobKey);
+    Transform rotate = ImagesServiceFactory.makeRotate(90);
+    Image rotatedImage = imagesService.applyTransform(rotate, blobImage);
+
+    // Write the transformed image back to a Cloud Storage object.
+    gcsService.createOrReplace(
+        new GcsFilename(bucket, "rotatedImage.jpeg"),
+        new GcsFileOptions.Builder().mimeType("image/jpeg").build(),
+        ByteBuffer.wrap(rotatedImage.getImageData()));
+    //[END rotate]
+
+    // Output some simple HTML to display the images we wrote to Cloud Storage
+    // in the browser. 
+    PrintWriter out = resp.getWriter();
+    out.println("<html><body>\n");
+    out.println("<img src='//storage.cloud.google.com/" + bucket
+        + "/image.jpeg' alt='AppEngine logo' />");
+    out.println("<img src='//storage.cloud.google.com/" + bucket
+        + "/resizedImage.jpeg' alt='AppEngine logo resized' />");
+    out.println("<img src='//storage.cloud.google.com/" + bucket
+        + "/rotatedImage.jpeg' alt='AppEngine logo rotated' />");
+    out.println("</body></html>\n");
+  }
+}
+// [END example]
diff --git a/appengine/images/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/images/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 00000000000..07bb4d7de99
--- /dev/null
+++ b/appengine/images/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- [START_EXCLUDE] -->
+<!--
+  Copyright 2016 Google Inc. All Rights Reserved.
+  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.
+-->
+<!-- [END_EXCLUDE] -->
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>YOUR-PROJECT-ID</application>
+  <version>YOUR-VERSION</version>
+  <threadsafe>true</threadsafe>
+</appengine-web-app>
diff --git a/appengine/images/src/main/webapp/WEB-INF/image.jpg b/appengine/images/src/main/webapp/WEB-INF/image.jpg
new file mode 100644
index 00000000000..3a60da2619d
Binary files /dev/null and b/appengine/images/src/main/webapp/WEB-INF/image.jpg differ
diff --git a/appengine/images/src/main/webapp/WEB-INF/web.xml b/appengine/images/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 00000000000..8ccba622877
--- /dev/null
+++ b/appengine/images/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
+  xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+  version="2.5">
+  <servlet>
+    <servlet-name>images</servlet-name>
+    <servlet-class>com.example.appengine.images.ImagesServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>images</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+</web-app>
diff --git a/pom.xml b/pom.xml
index bd885080d87..96369b9ed33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,12 +46,14 @@
         <module>appengine/analytics</module>
         <module>appengine/appidentity</module>
         <module>appengine/channel</module>
+        <module>appengine/cloudsql</module>
         <module>appengine/datastore</module>
         <module>appengine/datastore/indexes</module>
         <module>appengine/datastore/indexes-exploding</module>
         <module>appengine/datastore/indexes-perfect</module>
         <module>appengine/guestbook-objectify</module>
         <module>appengine/helloworld</module>
+        <module>appengine/images</module>
         <module>appengine/logs</module>
         <module>appengine/mailgun</module>
         <module>appengine/mailjet</module>
@@ -71,11 +73,13 @@
         <module>appengine/xmpp</module>
         <module>bigquery</module>
         <module>compute/cmdline</module>
+        <module>compute/sendgrid</module>
         <module>datastore</module>
         <module>logging</module>
         <module>managed_vms/analytics</module>
         <module>managed_vms/async-rest</module>
         <module>managed_vms/cloudstorage</module>
+        <module>managed_vms/cron</module>
         <module>managed_vms/datastore</module>
         <module>managed_vms/disk</module>
         <module>managed_vms/extending-runtime</module>