Merge "Add missing test annotations for Ibdafe89474dd69c5b70c67ec98fed4."