Fix for sahara simple gre test

Change-Id: Ie453f950727e69480b6efd0e27387ebacde84fb9
Merge "Fix for sahara simple gre test"