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

Change-Id: I7c7dc265bf5ba27b61794d114937c2c4c0816470