Merge "Clean up the visibility rules for framework modules"