Merge "Renumber tests 988-Too{Wide,Deep}ClassInstanceOf" am: 7ecd6920be am: d5a03bd022
am: 4d9c85c17e

Change-Id: I753f3d49978567012e9d87218b89fcef5e9c5bc8