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

Change-Id: I289fe08f8d7cc744d864cb77ce7ad3a2ae96263a