Merge "Restrict visibility of intra.core.stubs"