Merge "Renumber test 988-redefine-use-after-free to 998" am: e9c2341737
am: c4308e3ff3

Change-Id: I754b5660a83ed45dffb5755190c8e37933d41dad