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

Change-Id: I11a8d9b1297aca3723e55c10aa76b498b78b45a6