fix for upload_manifests

Change-Id: I78abdc388f8ad488543a571e2be975e560e5dd9f
Merge "fix for upload_manifests"