Merge "Remove unnecessary usages of core-all and restrict its visibility"