Merge "Disable cdex-fast + redefine-stress"
am: 0dc1b92c76

Change-Id: Ic2116f4de373685fd2412ceeaa66a34d6115e2df