Merge "Don't grant visibility based on non-exported components"