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

Change-Id: I7949b8e7c2d9b312be0fc2bb975ea9eab1e7e65b