Merge "Merge "Don\'t wedge full data backups by blocking the data consumer thread" into nyc-dev am: 46286e1824 am: f8ef354a35" into nyc-mr1-dev-plus-aosp
am: ed4ec7dc60

* commit 'ed4ec7dc602fcd287bd96971f98f2ae1fbca2d65':

Change-Id: I639e05819391c9bff002a476d501fe85fab9b2f6