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