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

* commit '3a8434bf739b3f34281b907912a35815bb6a48a3':

Change-Id: Ife5091af64cc431ff584debc7fbf31a0d106aaca