Merge "don't blindly reuse content providers" into oc-dev