Renamed missing 'savanna' tags to 'sahara'

Change-Id: I830dea829125aa47f7f2904268ae00016e56cf24
Merge "Renamed missing 'savanna' tags to 'sahara'"