Merge "Suppress broken annotation test"