Merge "Add directory support to PushFilePreparer."