Merge "Add new Download Error Codes" am: e9bd5449b5
am: 946ff79971

Change-Id: I756df5c78a96a59468f54ac35e9668d66cf64901