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

Change-Id: Ie577452177e364cde4e894f492b439988a6d214a