Fix for sahara test

Change-Id: I310fd3bd71c6928ec2713febb986067d2b20a5ce
Closes-Bug: #1333124
Merge "Fix for sahara test"