Remove savanna aliases

Change-Id: I036424383340a42599f0f83b58fe8ab198c9e3c3
Merge "Remove savanna aliases"