Merge "Abort fetching items if remote sends us an error"
am: 60a720c650

Change-Id: Ief7c8def22fbc6e68f9272ebb340e17a943f0968