Merge "Remove unnecessary inheritance layer between aliases."