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

Change-Id: Idf1385756124af4949787c2cd4dc158a8fe7799d