Merge "Correct visibility to use __pkg__"