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

* commit '483da3be8575b8e21e8a4133334102b19dd3c68b':
  Add utility to prepare files in a similar way to directories

Change-Id: I1fb4e385c165e5481303d8fd2f3f78c1095e5618