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

Change-Id: I408b9486c4fd801f153d1b2a06559f3882a88a8b