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

Change-Id: I90d8a52c4d15b1acf26bb6645ae459528c343603