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

Change-Id: I08f930a98d1a0fa2e72e51acbe88a0f094727c48