Merge "Fix ota test case"