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

* commit '46286e18244b70a40dd965bf10f8ba90da54ac8c':
  Don't wedge full data backups by blocking the data consumer thread

Change-Id: Ifaf2a580065ad1a1d51040c82051c32875c6bcaf