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

Change-Id: Id67356d2c477b07abd7695279c5bd07bc43c428f