Merge branch 'net-unexport-some-symbols-that-are-annotated-__init'