Merge "Fix broken createArchives task." into nyc-support-25.2-dev
am: b5ccf8c7a6

Change-Id: I9adff0ecbc9cf74e6e1786c93a3050fcc59f7fab