Merge "Fix coverage annotations"