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

Change-Id: Ife8294d44c3e3e6c5606fe7fd949effd060b48c0