Merge "Removed old data stack" into tm-qpr-dev-plus-aosp