Merge pull request #476 from iamqizhao/master

deflake a test and interop test format fix