Merge "update tests for bug 2112187" into mcp/epoxy