Merge "Adding permission for traceur to use content provider"