Merge "Prune framework-all visibility"