Merge "Deprecating unused get{Provider,Consumer} Functionality"