Merge "Revert "Re-add getAliasName to fix build breakage""
am: 944fed6b66

Change-Id: Id9a95b707b14ea11b24504b423bc936bb0f18ced