Merge "Removing unnecessary abstraction of AdapterProvider" into tm-qpr-dev