First step of renaming Savanna to Sahara

Change-Id: I766129df0ebb21b6657e49778ac6246dee4c51e9
Merge "First step of renaming Savanna to Sahara"