Merge "Revert "Fix build: Make an internal class package private"" into mnc-ub-dev