Merge "Add utility to prepare files in a similar way to directories" into nyc-dev am: 6a29fe931d
am: 65d7c4722c

* commit '65d7c4722c7cfe5d8bd98bbd3f38bca97901a06a':
  Add utility to prepare files in a similar way to directories

Change-Id: Ibb9a117e02605f1164d220e58fc84b143e55b9c2