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

* commit '8ef4aa3658d8f4eb96d02886bf6e3701c4606913':

Change-Id: Ie113fb3879988ecc062ecd8edcc2fd0421154a6e