Rename Savanna to Sahara

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