Super patch to stabilize our suites

Change-Id: I181182355d8bf4ecf0f1921bc8ef99687cb7d0ff
Signed-off-by: Luis Gomez <ecelgp@gmail.com>