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: 5908b3c1
* commit '5908b3c1':
Change-Id: I954e7e499614b232acee824d9fb80b51a6fbc5f3