Merge "More default visibility for framework modules"