Merge "Update conformance image for consistency"