Merge "Revert "Re-add getAliasName to fix build breakage""