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

Change-Id: I4f4cd2c265dc1286cd116417d85b7cff648f9903