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

Change-Id: I1737bed28b65ceedb53defb267ed3edafdd377b9