Merge "Test API behavior change in standalone test case"