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