Merge "Revert "Revert "Disable cdex-fast + redefine-stress""" am: cee0ec1764
am: eeff581042

Change-Id: I28ae36c6008df7ae7c47962294321b7e9e812929