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

Change-Id: Ia071e2291dfb0a40f7881ae28b76d10622633d21