Rename Savanna to Sahara

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