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

Change-Id: I4f965e8712f7c039c54162584f48f3a103420601