Use a separeate alias file

Change-Id: Ie9b5dbd8cb1bcfa69a2c9acc3336f066da7ce30e