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

Change-Id: I5eba169aebff220a2d3dc6cff08fbd3bc6ef78e7