Merge "Simplify module visibility post build refactor" into mainline-prod