diff --git a/puncture_fs/Android.mk b/puncture_fs/Android.mk
new file mode 100644
index 0000000..0b79cca
--- /dev/null
+++ b/puncture_fs/Android.mk
@@ -0,0 +1,31 @@
+# Copyright (C) 2014 The Android Open Source Project
+#
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := puncture_fs.c
+
+LOCAL_C_INCLUDES += system/core/logwrapper/include
+
+LOCAL_SHARED_LIBRARIES := libc liblog liblogwrap
+
+LOCAL_MODULE := puncture_fs
+
+LOCAL_MODULE_TAGS := debug
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+
+include $(BUILD_EXECUTABLE)
diff --git a/puncture_fs/NOTICE b/puncture_fs/NOTICE
new file mode 100644
index 0000000..316b4eb
--- /dev/null
+++ b/puncture_fs/NOTICE
@@ -0,0 +1,190 @@
+
+   Copyright (c) 2014, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   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.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
diff --git a/puncture_fs/puncture_fs.c b/puncture_fs/puncture_fs.c
new file mode 100644
index 0000000..e9d08dc
--- /dev/null
+++ b/puncture_fs/puncture_fs.c
@@ -0,0 +1,262 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * 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.
+ */
+
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <logwrap/logwrap.h>
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+#include <utils/Log.h>
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+
+#define MAX_IO_WRITE_CHUNK_SIZE 0x100000
+
+#ifndef min
+#define min(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
+typedef unsigned long u64;
+
+static void usage(const char * const progname) {
+    fprintf(stderr,
+            "Usage: %s [-s <seed>] -h <hole size in bytes> -t <total hole size in bytes> "
+            "path\n",
+            progname);
+}
+
+static u64 get_free_space(const char * const path) {
+    struct statvfs s;
+
+    if (statvfs(path, &s) < 0) {
+        fprintf(stderr, "\nerrno: %d. Failed to get free disk space on %s\n",
+                errno, path);
+        return 0;
+    } else {
+        return (u64)s.f_bsize * (u64)s.f_bfree;
+    }
+}
+
+static u64 get_random_num(const u64 start, const u64 end) {
+    if (end - start <= 0)
+        return start;
+    assert(RAND_MAX >= 0x7FFFFFFF);
+    if ((end - start) > 0x7FFFFFFF)
+        return start + (((u64)random() << 31) | (u64)random()) % (end - start);
+    return start + (random() % (end - start));
+}
+
+static char get_random_char() {
+    return 'A' + random() % ('Z' - 'A');
+}
+
+static bool create_unique_file(const char * const dir_path, const u64 size,
+                               const u64 id, char * const base,
+                               const u64 base_length) {
+    u64 length = 0;
+    int fd;
+    char file_path[FILENAME_MAX];
+    bool ret = true;
+
+    base[random() % min(base_length, size)] = get_random_char();
+
+    sprintf(file_path, "%s/file_%lu", dir_path, id);
+    fd = open(file_path, O_WRONLY | O_CREAT | O_SYNC, 0777);
+    if (fd < 0) {
+        // We suppress ENOSPC erros as that is common as we approach the
+        // last few MBs of the fs as we don't account for the size of the newly
+        // added meta data after the initial free space computation.
+        if (errno != 28) {
+            fprintf(stderr, "\nerrno: %d. Failed to create %s\n", errno, file_path);
+        }
+        return false;
+    }
+    while (length + base_length < size) {
+        if (write(fd, base, base_length) < 0) {
+            if (errno != 28) {
+                fprintf(stderr, "\nerrno: %d. Failed to write %lu bytes to %s\n",
+                        errno, base_length, file_path);
+            }
+            ret = false;
+            goto done;
+        }
+        length += base_length;
+    }
+    if (write(fd, base, size - length) < 0) {
+        if (errno != 28) {
+            fprintf(stderr, "\nerrno: %d. Failed to write last %lu bytes to %s\n",
+                    errno, size - length, file_path);
+        }
+        ret = false;
+        goto done;
+    }
+done:
+    if (close(fd) < 0) {
+        fprintf(stderr, "\nFailed to close %s\n", file_path);
+        ret = false;
+    }
+    return ret;
+}
+
+static bool create_unique_dir(char *dir, const char * const root_path) {
+    char random_string[15];
+    int i;
+
+    for (i = 0; i < 14; ++i) {
+        random_string[i] = get_random_char();
+    }
+    random_string[14] = '\0';
+
+    sprintf(dir, "%s/%s", root_path, random_string);
+
+    if (mkdir(dir, 0777) < 0) {
+        fprintf(stderr, "\nerrno: %d. Failed to create %s\n", errno, dir);
+        return false;
+    }
+    return true;
+}
+
+static bool puncture_fs (const char * const path, const u64 total_size,
+                         const u64 hole_size, const u64 total_hole_size) {
+    u64 increments = (hole_size * total_size) / total_hole_size;
+    u64 hole_max;
+    u64 starting_max = 0;
+    u64 ending_max = increments;
+    char stay_dir[FILENAME_MAX], delete_dir[FILENAME_MAX];
+    char *rm_bin_argv[] = { "/system/bin/rm", "-rf", ""};
+    u64 file_id = 1;
+    char *base_file_data;
+    u64 i = 0;
+
+    if (!create_unique_dir(stay_dir, path) ||
+        !create_unique_dir(delete_dir, path)) {
+        return false;
+    }
+
+    base_file_data = (char*) malloc(MAX_IO_WRITE_CHUNK_SIZE);
+    for (i = 0; i < MAX_IO_WRITE_CHUNK_SIZE; ++i) {
+        base_file_data[i] = get_random_char();
+    }
+    fprintf(stderr, "\n");
+    while (ending_max <= total_size) {
+        fprintf(stderr, "\rSTAGE 1/2: %d%% Complete",
+                (int) (100.0 * starting_max / total_size));
+        hole_max = get_random_num(starting_max, ending_max);
+
+        create_unique_file(stay_dir,
+                           hole_max - starting_max,
+                           file_id++,
+                           base_file_data,
+                           MAX_IO_WRITE_CHUNK_SIZE);
+        create_unique_file(delete_dir,
+                           hole_size,
+                           file_id++,
+                           base_file_data,
+                           MAX_IO_WRITE_CHUNK_SIZE);
+
+        starting_max = hole_max + hole_size;
+        ending_max += increments;
+    }
+    create_unique_file(stay_dir,
+                       (ending_max - increments - starting_max),
+                       file_id++,
+                       base_file_data,
+                       MAX_IO_WRITE_CHUNK_SIZE);
+    fprintf(stderr, "\rSTAGE 1/2: 100%% Complete\n");
+    fprintf(stderr, "\rSTAGE 2/2: 0%% Complete");
+    free(base_file_data);
+    rm_bin_argv[2] = delete_dir;
+    if (android_fork_execvp_ext(ARRAY_SIZE(rm_bin_argv), rm_bin_argv,
+                                NULL, 1, LOG_KLOG, 0, NULL, NULL, 0) < 0) {
+        fprintf(stderr, "\nFailed to delete %s\n", rm_bin_argv[2]);
+        return false;
+    }
+    fprintf(stderr, "\rSTAGE 2/2: 100%% Complete\n");
+    return true;
+}
+
+int main (const int argc, char ** const argv) {
+    int opt;
+    int mandatory_opt;
+    char *path = NULL;
+    int seed = time(NULL);
+
+    u64 total_size = 0;
+    u64 hole_size = 0;
+    u64 total_hole_size = 0;
+
+    mandatory_opt = 2;
+    while ((opt = getopt(argc, argv, "s:h:t:")) != -1) {
+        switch(opt) {
+            case 's':
+                seed = atoi(optarg);
+                break;
+            case 'h':
+                hole_size = atoll(optarg);
+                mandatory_opt--;
+                break;
+            case 't':
+                total_hole_size = atoll(optarg);
+                mandatory_opt--;
+                break;
+            default:
+                usage(argv[0]);
+                exit(EXIT_FAILURE);
+        }
+    }
+    if (mandatory_opt) {
+        usage(argv[0]);
+        exit(EXIT_FAILURE);
+    }
+    if (optind >= argc) {
+        fprintf(stderr, "\nExpected path name after options.\n");
+        usage(argv[0]);
+        exit(EXIT_FAILURE);
+    }
+    path = argv[optind++];
+
+    if (optind < argc) {
+        fprintf(stderr, "\nUnexpected argument: %s\n", argv[optind]);
+        usage(argv[0]);
+        exit(EXIT_FAILURE);
+    }
+
+    srandom(seed);
+    fprintf(stderr, "\nRandom seed is: %d\n", seed);
+
+    total_size = get_free_space(path);
+    if (!total_size) {
+        exit(EXIT_FAILURE);
+    }
+    if (total_size < total_hole_size || total_hole_size < hole_size) {
+        fprintf(stderr, "\nInvalid sizes: total available size should be "
+                        "larger than total hole size which is larger than "
+                        "hole size\n");
+        exit(EXIT_FAILURE);
+    }
+
+    if (!puncture_fs(path, total_size, hole_size, total_hole_size)) {
+        exit(EXIT_FAILURE);
+    }
+    return 0;
+}