Merge "Merge "Don\'t wedge full data backups by blocking the data consumer...
Merge "Merge "Don\'t wedge full data backups by blocking the data consumer thread" into nyc-dev am: 46286e18 am: f8ef354a" into nyc-mr1-dev-plus-aosp
am: ed4ec7dc
* commit 'ed4ec7dc':
Change-Id: I639e05819391c9bff002a476d501fe85fab9b2f6