Merge "Removed unused private implementation class"