Merge "Fix visibility rules now that Make supports visibility checks"