Rename Savanna to Sahara

Change-Id: I03627f131d2d7c72a8d3cf252db0feddedb7bebe
Merge "Rename Savanna to Sahara"