Merge "Remove interface json and set skip_test method"