Merge "Remove global skip for redefine-stress"
am: cabc6df1ea

Change-Id: I1d5cf59864e96a0ac0e92fc7a36c7ee8662c3b53