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

Change-Id: I738218b47ba0019210803ff8d4bb36d5bcc12aed