Merge "Revert "Verify that the component is exported""