Initial alias implementation

Change-Id: I16d1591246b4d7e1b1f810dfa59a75159eba88d5
Merge "Initial alias implementation"