Savanna -> Sahara rename

Change-Id: I9e01ce716e0b75cc7b3cf8b7659a129b2746b1a7
Merge "Savanna -> Sahara rename"