Merge "Revert "Revert "Disable cdex-fast + redefine-stress""" am: cee0ec1764 am: eeff581042
am: 42bd98c3ac

Change-Id: I5e4aae5124c556a2cb593968b442e6c28f8b1582