Add support for sahara

Change-Id: Idda7fd7c4c7d7346db132844373f857f96ef134f