Merge "More default visibility for framework modules" into mainline-prod