Fix for sahara test

Change-Id: I310fd3bd71c6928ec2713febb986067d2b20a5ce
Closes-Bug: #1333124
(cherry picked from commit 3f5f6352d43c38867a25998bcc7da5d7ff779bd4)