Merge "Remove invalid annotations from IBaz." am: e322e7e1aa am: bc95bdc195
am: ee950c5f8f

Change-Id: I38d39f4686f583b36d8fbceb4b5ddd445f01afad