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

Change-Id: Iad346ef3830f6643145942fefe0341f6ed99c39c