Merge "Fix deploy failure and other test cases."