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':
Don't wedge full data backups by blocking the data consumer thread
Change-Id: Ib047bfc04dac2fcf63bcce01250e5988b946c7b0