Merge "Re-add getAliasName to fix build breakage"
am: e905264d3c

Change-Id: Icda73f1ab221523248249f88fb9f0f4dd5da3a19